From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 23 Mar 2012 21:43:40 +0000 (-0700)
Subject: hpwdt: fix stable merge
X-Git-Tag: v2.6.39-400.9.0~565^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=88e35f9546a2fa26d6573513b5e057a426799cc3;p=users%2Fjedix%2Flinux-maple.git

hpwdt: fix stable merge

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 33b0d369e79d..57a848bc070e 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -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;
 			}
 		}