aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/numaq_32.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 03:27:29 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:52 -0400
commitde93410310952fb7b705f784ef22493c8362dbe8 (patch)
treeebf9925e8f78343ddb24049cc9146ead4df34661 /arch/x86/kernel/apic/numaq_32.c
parentf4848472cd99487e182b64fb2a5d0e4fedbe86ad (diff)
x86: Move ioapic_ids_setup to x86_init_ops
32bit and also the numaq code have special requirements on the ioapic_id setup. Convert it to a x86_init_ops function and get rid of the quirks and #ifdefs Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/apic/numaq_32.c')
-rw-r--r--arch/x86/kernel/apic/numaq_32.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index b5f0b1dc7dd0..f3717659265d 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -262,12 +262,6 @@ static void __init
262 } 262 }
263} 263}
264 264
265static int __init numaq_setup_ioapic_ids(void)
266{
267 /* so can skip it */
268 return 1;
269}
270
271static struct x86_quirks numaq_x86_quirks __initdata = { 265static struct x86_quirks numaq_x86_quirks __initdata = {
272 .arch_pre_time_init = numaq_pre_time_init, 266 .arch_pre_time_init = numaq_pre_time_init,
273 .arch_time_init = NULL, 267 .arch_time_init = NULL,
@@ -280,7 +274,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
280 .mpc_oem_bus_info = mpc_oem_bus_info, 274 .mpc_oem_bus_info = mpc_oem_bus_info,
281 .mpc_oem_pci_bus = mpc_oem_pci_bus, 275 .mpc_oem_pci_bus = mpc_oem_pci_bus,
282 .smp_read_mpc_oem = smp_read_mpc_oem, 276 .smp_read_mpc_oem = smp_read_mpc_oem,
283 .setup_ioapic_ids = numaq_setup_ioapic_ids,
284}; 277};
285 278
286static __init void early_check_numaq(void) 279static __init void early_check_numaq(void)
@@ -299,6 +292,7 @@ static __init void early_check_numaq(void)
299 if (found_numaq) { 292 if (found_numaq) {
300 x86_quirks = &numaq_x86_quirks; 293 x86_quirks = &numaq_x86_quirks;
301 x86_init.mpparse.mpc_record = numaq_mpc_record; 294 x86_init.mpparse.mpc_record = numaq_mpc_record;
295 x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
302 } 296 }
303} 297}
304 298