lkml.org 
[lkml]   [2010]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] x86, NMI: Add touch_nmi_watchdog to io_check_error delay
    Date
    From: Huang Ying <ying.huang@intel.com>

    Prevent the long delay in io_check_error making NMI watchdog timeout.

    Signed-off-by: Huang Ying <ying.huang@intel.com>
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    ---
    arch/x86/kernel/traps.c | 8 +++++---
    1 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
    index e04e59b..bef859e 100644
    --- a/arch/x86/kernel/traps.c
    +++ b/arch/x86/kernel/traps.c
    @@ -344,9 +344,11 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
    reason = (reason & NMI_REASON_CLEAR_MASK) | NMI_REASON_CLEAR_IOCHK;
    outb(reason, NMI_REASON_PORT);

    - i = 2000;
    - while (--i)
    - udelay(1000);
    + i = 20000;
    + while (--i) {
    + touch_nmi_watchdog();
    + udelay(100);
    + }

    reason &= ~NMI_REASON_CLEAR_IOCHK;
    outb(reason, NMI_REASON_PORT);
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-10-16 04:25    [W:0.023 / U:33.068 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site