aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 06:34:47 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:53 -0400
commit90e1c6969d8711edb888a00ec54c74370f125c8f (patch)
treece096ac8adec548d968a997411291213cfd511d6 /arch/x86/kernel
parent52fdb5684660f9fd7129f7bbbe279a02893bacb8 (diff)
x86: Move oem_bus_info to x86_init_ops
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic/numaq_32.c2
-rw-r--r--arch/x86/kernel/mpparse.c14
-rw-r--r--arch/x86/kernel/x86_init.c1
3 files changed, 10 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index feebe8eed7dd..700273dca684 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_oem_bus_info = mpc_oem_bus_info,
274}; 273};
275 274
276static __init void early_check_numaq(void) 275static __init void early_check_numaq(void)
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void)
293 x86_init.mpparse.mpc_apic_id = mpc_apic_id; 292 x86_init.mpparse.mpc_apic_id = mpc_apic_id;
294 x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem; 293 x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;
295 x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus; 294 x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;
295 x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;
296 } 296 }
297} 297}
298 298
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 72e1140723cf..a42f23f1dc7e 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -72,16 +72,18 @@ static void __init MP_processor_info(struct mpc_cpu *m)
72} 72}
73 73
74#ifdef CONFIG_X86_IO_APIC 74#ifdef CONFIG_X86_IO_APIC
75static void __init MP_bus_info(struct mpc_bus *m) 75void __init default_mpc_oem_bus_info(struct mpc_bus *m, char *str)
76{ 76{
77 char str[7];
78 memcpy(str, m->bustype, 6); 77 memcpy(str, m->bustype, 6);
79 str[6] = 0; 78 str[6] = 0;
79 apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->busid, str);
80}
81
82static void __init MP_bus_info(struct mpc_bus *m)
83{
84 char str[7];
80 85
81 if (x86_quirks->mpc_oem_bus_info) 86 x86_init.mpparse.mpc_oem_bus_info(m, str);
82 x86_quirks->mpc_oem_bus_info(m, str);
83 else
84 apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->busid, str);
85 87
86#if MAX_MP_BUSSES < 256 88#if MAX_MP_BUSSES < 256
87 if (m->busid >= MAX_MP_BUSSES) { 89 if (m->busid >= MAX_MP_BUSSES) {
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index fb5d93c077d8..27685edc5460 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -31,5 +31,6 @@ struct __initdata x86_init_ops x86_init = {
31 .setup_ioapic_ids = x86_init_noop, 31 .setup_ioapic_ids = x86_init_noop,
32 .mpc_apic_id = default_mpc_apic_id, 32 .mpc_apic_id = default_mpc_apic_id,
33 .smp_read_mpc_oem = default_smp_read_mpc_oem, 33 .smp_read_mpc_oem = default_smp_read_mpc_oem,
34 .mpc_oem_bus_info = default_mpc_oem_bus_info,
34 }, 35 },
35}; 36};