lkml.org 
[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[46/75] watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
    3.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Mingarelli, Thomas" <Thomas.Mingarelli@hp.com>

    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>

    ---
    drivers/watchdog/hpwdt.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/watchdog/hpwdt.c
    +++ b/drivers/watchdog/hpwdt.c
    @@ -230,6 +230,7 @@ static int __devinit cru_detect(unsigned

    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) {
    @@ -247,8 +248,10 @@ static int __devinit cru_detect(unsigned
    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",



    \
     
     \ /
      Last update: 2012-01-04 00:07    [W:0.019 / U:0.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site