]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
hpwdt: fix stable merge
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 23 Mar 2012 21:43:40 +0000 (14:43 -0700)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 23 Mar 2012 21:43:40 +0000 (14:43 -0700)
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
drivers/watchdog/hpwdt.c

index 33b0d369e79d715a6044519dcf52fa4ee4e8f4d6..57a848bc070e8db3df5a3d3eea6b3fc6a9060e85 100644 (file)
@@ -249,7 +249,8 @@ static int __devinit cru_detect(unsigned long map_entry,
                        cru_rom_addr =
                                ioremap(cru_physical_address, cru_length);
                        if (cru_rom_addr) {
-                               set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK, cru_length >> PAGE_SHIFT);
+                               set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+                                       (cru_length + PAGE_SIZE - 1) >> PAGE_SHIFT);
                                retval = 0;
                        }
                }