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/visws_quirks.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/visws_quirks.c')
| -rw-r--r-- | arch/x86/kernel/visws_quirks.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c index a49013716da9..2719091b3351 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/kernel/visws_quirks.c @@ -224,11 +224,10 @@ static void __init visws_find_smp_config(unsigned int reserve) mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; } -static int visws_trap_init(void); +static void visws_trap_init(void); static struct x86_quirks visws_x86_quirks __initdata = { .arch_time_init = visws_time_init, - .arch_trap_init = visws_trap_init, }; void __init visws_early_detect(void) @@ -252,6 +251,7 @@ void __init visws_early_detect(void) x86_init.mpparse.get_smp_config = visws_get_smp_config; x86_init.mpparse.find_smp_config = visws_find_smp_config; x86_init.irqs.pre_vector_init = visws_pre_intr_init; + x86_init.irqs.trap_init = visws_trap_init; /* * Install reboot quirks: @@ -390,12 +390,10 @@ static __init void cobalt_init(void) co_apic_read(CO_APIC_ID)); } -static int __init visws_trap_init(void) +static void __init visws_trap_init(void) { lithium_init(); cobalt_init(); - - return 1; } /* |