x86: Move oem_bus_info to x86_init_ops

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2009-08-20 12:34:47 +02:00
parent 52fdb56846
commit 90e1c6969d
6 changed files with 18 additions and 10 deletions

View File

@@ -64,12 +64,18 @@ extern void early_reserve_e820_mpc_new(void);
extern int enable_update_mptable;
extern int default_mpc_apic_id(struct mpc_cpu *m);
extern void default_smp_read_mpc_oem(struct mpc_table *mpc);
# ifdef CONFIG_X86_IO_APIC
extern void default_mpc_oem_bus_info(struct mpc_bus *m, char *str);
# else
# define default_mpc_oem_bus_info NULL
# endif
#else
static inline void find_smp_config(void) { }
static inline void early_reserve_e820_mpc_new(void) { }
#define enable_update_mptable 0
#define default_mpc_apic_id NULL
#define default_smp_read_mpc_oem NULL
#define default_mpc_oem_bus_info NULL
#endif
void __cpuinit generic_processor_info(int apicid, int version);

View File

@@ -12,7 +12,6 @@
/*
* Any setup quirks to be performed?
*/
struct mpc_bus;
struct x86_quirks {
int (*arch_pre_time_init)(void);
@@ -22,8 +21,6 @@ struct x86_quirks {
int (*arch_trap_init)(void);
int (*mach_get_smp_config)(unsigned int early);
int (*mach_find_smp_config)(unsigned int reserve);
void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
};
extern void x86_quirk_intr_init(void);

View File

@@ -12,6 +12,7 @@ struct mpc_table;
* @mpc_apic_id: platform specific mpc apic id assignment
* @smp_read_mpc_oem: platform specific oem mpc table setup
* @mpc_oem_pci_bus: platform specific pci bus setup (default NULL)
* @mpc_oem_bus_info: platform specific mpc bus info
*/
struct x86_init_mpparse {
void (*mpc_record)(unsigned int mode);
@@ -19,6 +20,7 @@ struct x86_init_mpparse {
int (*mpc_apic_id)(struct mpc_cpu *m);
void (*smp_read_mpc_oem)(struct mpc_table *mpc);
void (*mpc_oem_pci_bus)(struct mpc_bus *m);
void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
};
/**