luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

traps: i386: expand clear_mem_error and remove from mach_traps.h

Browse Source 
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>
This commit is contained in:
Alexander van Heukelum 2008-10-03 22:00:36 +02:00 committed by Ingo Molnar
parent 1c9af8a9f4
commit 7970479c48
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/traps_32.c
View File

@ -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

6
include/asm-x86/mach-default/mach_traps.h
View File

@ -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);