diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 06:34:47 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:53 -0400 |
commit | 90e1c6969d8711edb888a00ec54c74370f125c8f (patch) | |
tree | ce096ac8adec548d968a997411291213cfd511d6 /arch/x86/include/asm/mpspec.h | |
parent | 52fdb5684660f9fd7129f7bbbe279a02893bacb8 (diff) |
x86: Move oem_bus_info to x86_init_ops
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/mpspec.h')
-rw-r--r-- | arch/x86/include/asm/mpspec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 5de8e92be2dc..e3c579efde7a 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
@@ -64,12 +64,18 @@ extern void early_reserve_e820_mpc_new(void); | |||
64 | extern int enable_update_mptable; | 64 | extern int enable_update_mptable; |
65 | extern int default_mpc_apic_id(struct mpc_cpu *m); | 65 | extern int default_mpc_apic_id(struct mpc_cpu *m); |
66 | extern void default_smp_read_mpc_oem(struct mpc_table *mpc); | 66 | extern void default_smp_read_mpc_oem(struct mpc_table *mpc); |
67 | # ifdef CONFIG_X86_IO_APIC | ||
68 | extern void default_mpc_oem_bus_info(struct mpc_bus *m, char *str); | ||
69 | # else | ||
70 | # define default_mpc_oem_bus_info NULL | ||
71 | # endif | ||
67 | #else | 72 | #else |
68 | static inline void find_smp_config(void) { } | 73 | static inline void find_smp_config(void) { } |
69 | static inline void early_reserve_e820_mpc_new(void) { } | 74 | static inline void early_reserve_e820_mpc_new(void) { } |
70 | #define enable_update_mptable 0 | 75 | #define enable_update_mptable 0 |
71 | #define default_mpc_apic_id NULL | 76 | #define default_mpc_apic_id NULL |
72 | #define default_smp_read_mpc_oem NULL | 77 | #define default_smp_read_mpc_oem NULL |
78 | #define default_mpc_oem_bus_info NULL | ||
73 | #endif | 79 | #endif |
74 | 80 | ||
75 | void __cpuinit generic_processor_info(int apicid, int version); | 81 | void __cpuinit generic_processor_info(int apicid, int version); |