diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 04:35:46 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 03:35:45 -0400 |
commit | 428cf9025b15573e16e658032f2b963283e34ae0 (patch) | |
tree | fc4620e8b7965bb191b0cebd879eaa53ede5bdda /arch/x86/kernel/setup.c | |
parent | 66bcaf0bde100a4b54b82fc6fea6ceee2212ffb4 (diff) |
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/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d3da0f7333f..bf3b87f1f7d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -1020,21 +1020,6 @@ void __init setup_arch(char **cmdline_p) | |||
1020 | 1020 | ||
1021 | #ifdef CONFIG_X86_32 | 1021 | #ifdef CONFIG_X86_32 |
1022 | 1022 | ||
1023 | /** | ||
1024 | * x86_quirk_trap_init - initialise system specific traps | ||
1025 | * | ||
1026 | * Description: | ||
1027 | * Called as the final act of trap_init(). Used in VISWS to initialise | ||
1028 | * the various board specific APIC traps. | ||
1029 | **/ | ||
1030 | void __init x86_quirk_trap_init(void) | ||
1031 | { | ||
1032 | if (x86_quirks->arch_trap_init) { | ||
1033 | if (x86_quirks->arch_trap_init()) | ||
1034 | return; | ||
1035 | } | ||
1036 | } | ||
1037 | |||
1038 | static struct irqaction irq0 = { | 1023 | static struct irqaction irq0 = { |
1039 | .handler = timer_interrupt, | 1024 | .handler = timer_interrupt, |
1040 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, | 1025 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, |