diff options
| author | Mingarelli, Thomas <Thomas.Mingarelli@hp.com> | 2011-11-07 10:59:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 15:38:03 -0800 |
| commit | e7dd20a398f6048a0855e112e7c1cbd0f1f38e13 (patch) | |
| tree | 46b4166684e1c3c9ea0031ad7f281c91a5444087 | |
| parent | c8cdf3f97d34d906e0519d5cbc2ab3f81269d0b4 (diff) | |
| download | linux-stable-e7dd20a398f6048a0855e112e7c1cbd0f1f38e13.tar.gz linux-stable-e7dd20a398f6048a0855e112e7c1cbd0f1f38e13.tar.bz2 linux-stable-e7dd20a398f6048a0855e112e7c1cbd0f1f38e13.zip | |
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 <thomas.mingarelli@hp.com>
Signed-off by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 0b9190754e24..2a9f54af75f2 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -220,6 +220,7 @@ static int __devinit cru_detect(unsigned long map_entry, cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE; + set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE)); asminline_call(&cmn_regs, bios32_entrypoint); if (cmn_regs.u1.ral != 0) { @@ -237,8 +238,10 @@ static int __devinit cru_detect(unsigned long map_entry, if ((physical_bios_base + physical_bios_offset)) { cru_rom_addr = ioremap(cru_physical_address, cru_length); - if (cru_rom_addr) + if (cru_rom_addr) { + set_memory_x((unsigned long)cru_rom_addr, cru_length); retval = 0; + } } printk(KERN_DEBUG "hpwdt: CRU Base Address: 0x%lx\n", |