From d5aaa8f70bfe09b8595e6b73e8808194fe63ab93 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Fri, 14 Nov 2008 15:47:03 +0100 Subject: [PATCH] --- yaml --- r: 119656 b: refs/heads/master c: 060264133b946786b4b28a1ba79e6725eaf258f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/hpwdt.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6dd649f6601f..7099c8f4aaea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28d41f53f05c51d4f445129de325b1072ee25b8b +refs/heads/master: 060264133b946786b4b28a1ba79e6725eaf258f3 diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c index a3765e0be4a8..f6cff7b5a547 100644 --- a/trunk/drivers/watchdog/hpwdt.c +++ b/trunk/drivers/watchdog/hpwdt.c @@ -40,6 +40,7 @@ #include #include #include +#include #define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ #define CRU_BIOS_SIGNATURE_VALUE 0x55524324 @@ -394,6 +395,8 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm) smbios_cru64_ptr->double_offset; cru_rom_addr = ioremap(cru_physical_address, smbios_cru64_ptr->double_length); + set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK, + smbios_cru64_ptr->double_length >> PAGE_SHIFT); } } }