From: Don Zickus <dzickus@redhat.com>
To: x86@kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
Huang Ying <ying.huang@intel.com>,
Don Zickus <dzickus@redhat.com>
Subject: [PATCH 3/3] x86, NMI: Add touch_nmi_watchdog to io_check_error delay
Date: Tue, 4 Jan 2011 22:38:09 -0500 [thread overview]
Message-ID: <1294198689-15447-3-git-send-email-dzickus@redhat.com> (raw)
In-Reply-To: <1294198689-15447-1-git-send-email-dzickus@redhat.com>
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 bb6f041..c76aaca 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -351,9 +351,11 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
reason = (reason & 0xf) | 8;
outb(reason, 0x61);
- i = 2000;
- while (--i)
- udelay(1000);
+ i = 20000;
+ while (--i) {
+ touch_nmi_watchdog();
+ udelay(100);
+ }
reason &= ~8;
outb(reason, 0x61);
--
1.7.3.4
next prev parent reply other threads:[~2011-01-05 3:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 3:38 [PATCH 1/3] x86: Only call smp_processor_id in non-preempt cases Don Zickus
2011-01-05 3:38 ` [PATCH 2/3] x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time Don Zickus
2011-01-05 14:07 ` [tip:perf/core] " tip-bot for Dongdong Deng
2011-01-05 3:38 ` Don Zickus [this message]
2011-01-05 14:08 ` [tip:perf/core] x86, NMI: Add touch_nmi_watchdog to io_check_error delay tip-bot for Huang Ying
2011-01-05 14:07 ` [tip:perf/core] x86: Only call smp_processor_id in non-preempt cases tip-bot for Don Zickus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294198689-15447-3-git-send-email-dzickus@redhat.com \
--to=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®