aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/traps_32.c3
-rw-r--r--include/asm-x86/mach-default/mach_traps.h6
2 files changed, 2 insertions, 7 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
319static notrace __kprobes void 320static notrace __kprobes void
diff --git a/include/asm-x86/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h
index de9ac3f5c4ce..ff8778f26b84 100644
--- a/include/asm-x86/mach-default/mach_traps.h
+++ b/include/asm-x86/mach-default/mach_traps.h
@@ -7,12 +7,6 @@
7 7
8#include <asm/mc146818rtc.h> 8#include <asm/mc146818rtc.h>
9 9
10static inline void clear_mem_error(unsigned char reason)
11{
12 reason = (reason & 0xf) | 4;
13 outb(reason, 0x61);
14}
15
16static inline unsigned char get_nmi_reason(void) 10static inline unsigned char get_nmi_reason(void)
17{ 11{
18 return inb(0x61); 12 return inb(0x61);