commit 428cf9025b15573e16e658032f2b963283e34ae0
author Thomas Gleixner <tglx@linutronix.de> Thu Aug 20 10:35:46 2009 +0200
committer Thomas Gleixner <tglx@linutronix.de> Mon Aug 31 09:35:45 2009 +0200
tree fc4620e8b7965bb191b0cebd879eaa53ede5bdda
parent 66bcaf0bde100a4b54b82fc6fea6ceee2212ffb4

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>

arch/x86/kernel/traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 7e4b1f5..ed96ed5 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 @@
 	 */
 	cpu_init();
 
-#ifdef CONFIG_X86_32
-	x86_quirk_trap_init();
-#endif
+	x86_init.irqs.trap_init();
 }