From: Alexander van Heukelum <heukelum@fastmail.fm>
To: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>
Cc: Alexander van Heukelum <heukelum@fastmail.fm>
Subject: [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
Date: Fri, 3 Oct 2008 22:00:35 +0200 [thread overview]
Message-ID: <1223064040-23170-5-git-send-email-heukelum@fastmail.fm> (raw)
In-Reply-To: <1223064040-23170-4-git-send-email-heukelum@fastmail.fm>
Make io_check_error equal to the one on i386.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
---
arch/x86/kernel/traps_64.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index a7aef2d..6bce291 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -253,13 +253,19 @@ mem_parity_error(unsigned char reason, struct pt_regs *regs)
static notrace __kprobes void
io_check_error(unsigned char reason, struct pt_regs *regs)
{
- printk("NMI: IOCK error (debug interrupt?)\n");
+ unsigned long i;
+
+ printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
show_registers(regs);
/* Re-enable the IOCK line, wait for a few seconds */
reason = (reason & 0xf) | 8;
outb(reason, 0x61);
- mdelay(2000);
+
+ i = 2000;
+ while (--i)
+ udelay(1000);
+
reason &= ~8;
outb(reason, 0x61);
}
--
1.5.4.3
next prev parent reply other threads:[~2008-10-03 20:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-03 20:00 [PATCH 0/9] traps: x86: finalize unification of traps.c Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 1/9] traps: x86: converge trap_init functions Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 2/9] traps: x86_64: make math_state_restore more like i386 Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 3/9] traps: i386: use preempt_conditional_sti/cli in do_int3 Alexander van Heukelum
2008-10-03 20:00 ` Alexander van Heukelum [this message]
2008-10-03 20:00 ` [PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 6/9] traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 7/9] traps: x86: various noop-changes preparing for unification of traps_xx.c Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 8/9] traps: x86: make traps_32.c and traps_64.c equal Alexander van Heukelum
2008-10-03 20:00 ` [PATCH 9/9] traps: x86: finalize unification of traps.c Alexander van Heukelum
2008-10-03 21:16 ` Resend: [PATCH 2/9] traps: x86_64: make math_state_restore more like i386 Alexander van Heukelum
2008-10-03 21:17 ` Resend: [PATCH 7/9] traps: x86: various noop-changes preparing for unification of traps_xx.c Alexander van Heukelum
2008-10-04 8:52 ` [PATCH 0/9] traps: x86: finalize unification of traps.c Ingo Molnar
2008-10-04 9:27 ` Ingo Molnar
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=1223064040-23170-5-git-send-email-heukelum@fastmail.fm \
--to=heukelum@fastmail.fm \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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®