diff options
| author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-03 16:00:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:33:25 -0400 |
| commit | 7970479c4881e156a0c07c1a7fdc564c8e3b2bfc (patch) | |
| tree | f4a40aa6b968c5e9c02b5cc2ebe70d4183e65107 /arch | |
| parent | 1c9af8a9f448abfe13f17fa76b7ca72b588a1edb (diff) | |
traps: i386: expand clear_mem_error and remove from mach_traps.h
This is the last user of clear_mem_error, which is defined
only on i386. Expand the inline function and remove it from
include/asm-x86/mach-default/mach_traps.h
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/traps_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 67953bbe193d..01e7ca8c7661 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
| @@ -313,7 +313,8 @@ mem_parity_error(unsigned char reason, struct pt_regs *regs) | |||
| 313 | printk(KERN_EMERG "Dazed and confused, but trying to continue\n"); | 313 | printk(KERN_EMERG "Dazed and confused, but trying to continue\n"); |
| 314 | 314 | ||
| 315 | /* Clear and disable the memory parity error line. */ | 315 | /* Clear and disable the memory parity error line. */ |
| 316 | clear_mem_error(reason); | 316 | reason = (reason & 0xf) | 4; |
| 317 | outb(reason, 0x61); | ||
| 317 | } | 318 | } |
| 318 | 319 | ||
| 319 | static notrace __kprobes void | 320 | static notrace __kprobes void |