aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/visws_quirks.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 03:41:38 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 03:35:45 -0400
commitd9112f43021554ded2ef2b9bea5f88ba4b52abe0 (patch)
tree40d8f33402f18af494549af8e9ee1a2f83fc2736 /arch/x86/kernel/visws_quirks.c
parentb3f1b617f49447df6c3f5fac9c225aaea8b724ea (diff)
x86: Move pre_intr_init to x86_init_ops
Replace the quirk machinery by a x86_init_ops function which defaults to the standard implementation. This is also a preparatory patch for Moorestown support which needs to replace the default init_ISA_irqs as well. 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.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 31e828118f8e..1d6309d70dfa 100644
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -73,14 +73,10 @@ static int __init visws_time_init(void)
73 return 0; 73 return 0;
74} 74}
75 75
76static int __init visws_pre_intr_init(void) 76/* Replaces the default init_ISA_irqs in the generic setup */
77static void __init visws_pre_intr_init(void)
77{ 78{
78 init_VISWS_APIC_irqs(); 79 init_VISWS_APIC_irqs();
79
80 /*
81 * We dont want ISA irqs to be set up by the generic code:
82 */
83 return 1;
84} 80}
85 81
86/* Quirk for machine specific memory setup. */ 82/* Quirk for machine specific memory setup. */
@@ -232,7 +228,6 @@ static int visws_trap_init(void);
232 228
233static struct x86_quirks visws_x86_quirks __initdata = { 229static struct x86_quirks visws_x86_quirks __initdata = {
234 .arch_time_init = visws_time_init, 230 .arch_time_init = visws_time_init,
235 .arch_pre_intr_init = visws_pre_intr_init,
236 .arch_intr_init = NULL, 231 .arch_intr_init = NULL,
237 .arch_trap_init = visws_trap_init, 232 .arch_trap_init = visws_trap_init,
238}; 233};
@@ -257,6 +252,7 @@ void __init visws_early_detect(void)
257 x86_init.resources.memory_setup = visws_memory_setup; 252 x86_init.resources.memory_setup = visws_memory_setup;
258 x86_init.mpparse.get_smp_config = visws_get_smp_config; 253 x86_init.mpparse.get_smp_config = visws_get_smp_config;
259 x86_init.mpparse.find_smp_config = visws_find_smp_config; 254 x86_init.mpparse.find_smp_config = visws_find_smp_config;
255 x86_init.irqs.pre_vector_init = visws_pre_intr_init;
260 256
261 /* 257 /*
262 * Install reboot quirks: 258 * Install reboot quirks: