diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 10:35:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 09:35:45 +0200 |
| commit | 428cf9025b15573e16e658032f2b963283e34ae0 (patch) | |
| tree | fc4620e8b7965bb191b0cebd879eaa53ede5bdda /arch/x86/kernel/traps.c | |
| parent | x86: Move irq_init to x86_init_ops (diff) | |
| download | linux-dev-428cf9025b15573e16e658032f2b963283e34ae0.tar.xz linux-dev-428cf9025b15573e16e658032f2b963283e34ae0.zip | |
x86: Move traps_init to x86_init_ops
Replace the quirks by a simple x86_init_ops function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 7e4b1f5dec8e..ed96ed53f69e 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -59,6 +59,7 @@ #include <asm/mach_traps.h> #ifdef CONFIG_X86_64 +#include <asm/x86_init.h> #include <asm/pgalloc.h> #include <asm/proto.h> #else @@ -980,7 +981,5 @@ void __init trap_init(void) */ cpu_init(); -#ifdef CONFIG_X86_32 - x86_quirk_trap_init(); -#endif + x86_init.irqs.trap_init(); } |