From 84abcc5d9c5cbeb6566974d77a549156a9b38a88 Mon Sep 17 00:00:00 2001 From: Maxim Uvarov Date: Tue, 10 Jan 2012 16:04:19 -0800 Subject: [PATCH] Revert "hpwd watchdog mark page executable" Orabug: 13115973 This reverts commit e7494242c42201128204e50b2a707de335dd6334. Bug fix is better covered with following upstream commit: commit da28179b4e90dda56912ee825c7eaa62fc103797 Author: Mingarelli, Thomas Date: Mon Nov 7 10:59:00 2011 +0100 watchdog: hpwdt: Changes to handle NX secure bit in 32bit path commit e67d668e147c3b4fec638c9e0ace04319f5ceccd upstream. This patch makes use of the set_memory_x() kernel API in order to make necessary BIOS calls to source NMIs. This is needed for SLES11 SP2 and the latest upstream kernel as it appears the NX Execute Disable has grown in its control. Signed-off by: Thomas Mingarelli Signed-off by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman --- drivers/watchdog/hpwdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 3ee6587c9757d..9cb60dfbb59eb 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -323,8 +323,6 @@ static int __devinit detect_cru_service(void) if (p == NULL) return -ENOMEM; - set_memory_x((unsigned long)p & PAGE_MASK, ROM_SIZE >> PAGE_SHIFT); - for (q = p; q < p + ROM_SIZE; q += 16) { rc = bios32_present(q); if (!rc) -- 2.50.1