[PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h

From: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
Date: Fri, 3 Oct 2008 22:00:36 +0200

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@xxxxxxxxxxx>
---
arch/x86/kernel/traps_32.c | 3 ++-
include/asm-x86/mach-default/mach_traps.h | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 535c41a..adc70ee 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -314,7 +314,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 de9ac3f..ff8778f 100644
--- 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);
--
1.5.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Follow-Ups:
- [PATCH 6/9] traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
  - From: Alexander van Heukelum

References:
- [PATCH 0/9] traps: x86: finalize unification of traps.c
  - From: Alexander van Heukelum
- [PATCH 1/9] traps: x86: converge trap_init functions
  - From: Alexander van Heukelum
- [PATCH 2/9] traps: x86_64: make math_state_restore more like i386
  - From: Alexander van Heukelum
- [PATCH 3/9] traps: i386: use preempt_conditional_sti/cli in do_int3
  - From: Alexander van Heukelum
- [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
  - From: Alexander van Heukelum

Prev by Date: RE: [PATCH] topology.h define mess fix
Next by Date: [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
Previous by thread: [PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
Next by thread: [PATCH 6/9] traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
Index(es):
- Date
- Thread

Relevant Pages

Re: inline keyword and linkage
... >> have some freedom in how they implement inline functions. ... >> A function defined within a class definition is an inline function. ... it shall be declared inline in all translation units in which it ...
(comp.lang.cpp)
Re: inline keyword and linkage
... > have some freedom in how they implement inline functions. ... > A function defined within a class definition is an inline function. ... it shall be declared inline in all translation units in which it ... > extern inline function is the same object in different translation units. ...
(comp.lang.cpp)
Re: inline keyword and linkage
... A function declared as "extern inline" is only guaranteed to ... A function defined within a class definition is an inline function. ... it shall be declared inline in all translation units in which it ...
(comp.lang.cpp)
Re: inline
... "inline" means that the compiler puts it inline if it can. ... of the object code for a function even though it is an inline function ... or only emit stand-alone object code ...
(comp.arch.embedded)
Re: Trapping Runtime Errors in C
... If it's just inline, the compiler may create an externally-visible ... My understanding was that you declare your inline function in a header file ... it'll do it in only that object file. ...
(comp.sys.acorn.programmer)