UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: remove mpc_oem_bus_info() 

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy 2008-03-17 22:08:48 +03:00 committed by Ingo Molnar
parent d285e33889
commit 0ec153af4d
8 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/mpparse_32.c
View File

@ -265,7 +265,11 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
memcpy(str, m->mpc_bustype, 6); memcpy(str, m->mpc_bustype, 6);
str[6] = 0; str[6] = 0;
#ifdef CONFIG_X86_NUMAQ
mpc_oem_bus_info(m, str, translation_table[mpc_record]); mpc_oem_bus_info(m, str, translation_table[mpc_record]);
#else
Dprintk("Bus #%d is %s\n", m->mpc_busid, str);
#endif
#if MAX_MP_BUSSES < 256 #if MAX_MP_BUSSES < 256
if (m->mpc_busid >= MAX_MP_BUSSES) { if (m->mpc_busid >= MAX_MP_BUSSES) {

12
arch/x86/pci/numa.c
View File

@ -17,6 +17,18 @@ int mp_bus_id_to_node[MAX_MP_BUSSES];
int mp_bus_id_to_local[MAX_MP_BUSSES]; int mp_bus_id_to_local[MAX_MP_BUSSES];
#define BUS2LOCAL(global) (mp_bus_id_to_local[global]) #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
{
int quad = translation->trans_quad;
int local = translation->trans_local;
mp_bus_id_to_node[m->mpc_busid] = quad;
mp_bus_id_to_local[m->mpc_busid] = local;
printk(KERN_INFO "Bus #%d is %s (node %d)\n",
m->mpc_busid, name, quad);
}
int quad_local_to_mp_bus_id [NR_CPUS/4][4]; int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
void mpc_oem_pci_bus(struct mpc_config_bus *m, void mpc_oem_pci_bus(struct mpc_config_bus *m,

4
include/asm-x86/genapic_32.h
View File

@ -48,9 +48,6 @@ struct genapic {
u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
/* mpparse */ /* mpparse */
void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *,
struct mpc_config_translation *);
/* When one of the next two hooks returns 1 the genapic /* When one of the next two hooks returns 1 the genapic
is switched to this. Essentially they are additional probe is switched to this. Essentially they are additional probe
functions. */ functions. */
@ -103,7 +100,6 @@ struct genapic {
APICFUNC(apicid_to_cpu_present) \ APICFUNC(apicid_to_cpu_present) \
APICFUNC(setup_portio_remap) \ APICFUNC(setup_portio_remap) \
APICFUNC(check_phys_apicid_present) \ APICFUNC(check_phys_apicid_present) \
APICFUNC(mpc_oem_bus_info) \
APICFUNC(mps_oem_check) \ APICFUNC(mps_oem_check) \
APICFUNC(get_apic_id) \ APICFUNC(get_apic_id) \
.apic_id_mask = APIC_ID_MASK, \ .apic_id_mask = APIC_ID_MASK, \

6
include/asm-x86/mach-default/mach_mpparse.h
View File

@ -1,12 +1,6 @@
#ifndef __ASM_MACH_MPPARSE_H #ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define __ASM_MACH_MPPARSE_H
static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
{
// Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
}
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid) char *productid)
{ {

6
include/asm-x86/mach-es7000/mach_mpparse.h
View File

@ -3,12 +3,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
{
Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
}
extern int parse_unisys_oem (char *oemptr); extern int parse_unisys_oem (char *oemptr);
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
extern void setup_unisys(void); extern void setup_unisys(void);

4
include/asm-x86/mach-generic/mach_mpparse.h
View File

@ -1,10 +1,6 @@
#ifndef _MACH_MPPARSE_H #ifndef _MACH_MPPARSE_H
#define _MACH_MPPARSE_H 1 #define _MACH_MPPARSE_H 1
#include <asm/genapic.h>
#define mpc_oem_bus_info (genapic->mpc_oem_bus_info)
int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
int acpi_madt_oem_check(char *oem_id, char *oem_table_id); int acpi_madt_oem_check(char *oem_id, char *oem_table_id);

16
include/asm-x86/mach-numaq/mach_mpparse.h
View File

@ -1,20 +1,8 @@
#ifndef __ASM_MACH_MPPARSE_H #ifndef __ASM_MACH_MPPARSE_H
#define __ASM_MACH_MPPARSE_H #define __ASM_MACH_MPPARSE_H
extern int mp_bus_id_to_local[MAX_MP_BUSSES]; extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
extern int mp_bus_id_to_node[MAX_MP_BUSSES]; struct mpc_config_translation *translation);
static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
{
int quad = translation->trans_quad;
int local = translation->trans_local;
mp_bus_id_to_node[m->mpc_busid] = quad;
mp_bus_id_to_local[m->mpc_busid] = local;
printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad);
}
extern void mpc_oem_pci_bus(struct mpc_config_bus *m, extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
struct mpc_config_translation *translation); struct mpc_config_translation *translation);

6
include/asm-x86/mach-summit/mach_mpparse.h
View File

@ -12,12 +12,6 @@ extern void setup_summit(void);
#define setup_summit() {} #define setup_summit() {}
#endif #endif
static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
{
Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
}
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid) char *productid)
{ {