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>

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 67953bbe193d2684be77c18e06b01bb837f06e29..01e7ca8c7661da288389c886726dfb010d1f348a 100644 (file)
--- 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)
        printk(KERN_EMERG "Dazed and confused, but trying to continue\n");
 
        /* Clear and disable the memory parity error line. */
-       clear_mem_error(reason);
+       reason = (reason & 0xf) | 4;
+       outb(reason, 0x61);
 }
 
 static notrace __kprobes void

diff --git a/include/asm-x86/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h
index de9ac3f5c4ce547c2a204cac41c4010da2839fe7..ff8778f26b84e3a9125b4a4f383b69ab649c5b20 100644 (file)
--- a/include/asm-x86/mach-default/mach_traps.h
+++ b/include/asm-x86/mach-default/mach_traps.h
@@ -7,12 +7,6 @@
 
 #include <asm/mc146818rtc.h>
 
-static inline void clear_mem_error(unsigned char reason)
-{
-       reason = (reason & 0xf) | 4;
-       outb(reason, 0x61);
-}
-
 static inline unsigned char get_nmi_reason(void)
 {
        return inb(0x61);