Commit 7970479c authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar

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: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1c9af8a9
...@@ -313,7 +313,8 @@ mem_parity_error(unsigned char reason, struct pt_regs *regs) ...@@ -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"); printk(KERN_EMERG "Dazed and confused, but trying to continue\n");
/* Clear and disable the memory parity error line. */ /* Clear and disable the memory parity error line. */
clear_mem_error(reason); reason = (reason & 0xf) | 4;
outb(reason, 0x61);
} }
static notrace __kprobes void static notrace __kprobes void
......
...@@ -7,12 +7,6 @@ ...@@ -7,12 +7,6 @@
#include <asm/mc146818rtc.h> #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) static inline unsigned char get_nmi_reason(void)
{ {
return inb(0x61); return inb(0x61);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment