diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 04:41:58 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:52 -0400 |
commit | fd6c6661492226bb82f422157c535ac573cbecbd (patch) | |
tree | bbc1f0e0f9496f4670799c507b472514a19bbd19 /arch/x86/kernel/apic/numaq_32.c | |
parent | de93410310952fb7b705f784ef22493c8362dbe8 (diff) |
x86: Move mpc_apic_id to x86_init_ops
The mpc_apic_id setup is handled by a x86_quirk. Make it a
x86_init_ops function with a default implementation.
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c index f3717659265d..222413f7e797 100644 --- a/arch/x86/kernel/apic/numaq_32.c +++ b/arch/x86/kernel/apic/numaq_32.c | |||
@@ -270,7 +270,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = { | |||
270 | .arch_trap_init = NULL, | 270 | .arch_trap_init = NULL, |
271 | .mach_get_smp_config = NULL, | 271 | .mach_get_smp_config = NULL, |
272 | .mach_find_smp_config = NULL, | 272 | .mach_find_smp_config = NULL, |
273 | .mpc_apic_id = mpc_apic_id, | ||
274 | .mpc_oem_bus_info = mpc_oem_bus_info, | 273 | .mpc_oem_bus_info = mpc_oem_bus_info, |
275 | .mpc_oem_pci_bus = mpc_oem_pci_bus, | 274 | .mpc_oem_pci_bus = mpc_oem_pci_bus, |
276 | .smp_read_mpc_oem = smp_read_mpc_oem, | 275 | .smp_read_mpc_oem = smp_read_mpc_oem, |
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void) | |||
293 | x86_quirks = &numaq_x86_quirks; | 292 | x86_quirks = &numaq_x86_quirks; |
294 | x86_init.mpparse.mpc_record = numaq_mpc_record; | 293 | x86_init.mpparse.mpc_record = numaq_mpc_record; |
295 | x86_init.mpparse.setup_ioapic_ids = x86_init_noop; | 294 | x86_init.mpparse.setup_ioapic_ids = x86_init_noop; |
295 | x86_init.mpparse.mpc_apic_id = mpc_apic_id; | ||
296 | } | 296 | } |
297 | } | 297 | } |
298 | 298 | ||