From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754670Ab0K3W2A (ORCPT ); Tue, 30 Nov 2010 17:28:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32698 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753999Ab0K3W17 (ORCPT ); Tue, 30 Nov 2010 17:27:59 -0500 From: Don Zickus To: Ingo Molnar Cc: Peter Zijlstra , Robert Richter , ying.huang@intel.com, Andi Kleen , gorcunov@gmail.com, LKML , Don Zickus Subject: [PATCH 2/9] x86, NMI: Add touch_nmi_watchdog to io_check_error delay Date: Tue, 30 Nov 2010 17:27:23 -0500 Message-Id: <1291156050-4482-3-git-send-email-dzickus@redhat.com> In-Reply-To: <1291156050-4482-1-git-send-email-dzickus@redhat.com> References: <1291156050-4482-1-git-send-email-dzickus@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying Prevent the long delay in io_check_error making NMI watchdog timeout. Signed-off-by: Huang Ying Signed-off-by: Don Zickus --- 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 10a43f5..c7fd1ce 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -353,9 +353,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.3.2