From 28447b98798926c0f6043be70d9ade1a836b54a7 Mon Sep 17 00:00:00 2001 From: Alexey Starikovskiy Date: Tue, 11 Mar 2008 22:55:42 +0300 Subject: [PATCH] --- yaml --- r: 88778 b: refs/heads/master c: e129cb490e842753b43af7aae136935fc0928dc8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/mpparse_32.c | 1 - trunk/arch/x86/pci/numa.c | 2 ++ trunk/include/asm-x86/mach-numaq/mach_mpparse.h | 2 ++ trunk/include/asm-x86/mpspec.h | 1 - 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d22eea4cc2a..d797985fad67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0a282c251181aa423d4831719613b8286b5b839 +refs/heads/master: e129cb490e842753b43af7aae136935fc0928dc8 diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c index 8795122db9bc..ae385b427841 100644 --- a/trunk/arch/x86/kernel/mpparse_32.c +++ b/trunk/arch/x86/kernel/mpparse_32.c @@ -47,7 +47,6 @@ int mp_bus_id_to_type [MAX_MP_BUSSES]; #endif DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); int mp_bus_id_to_node [MAX_MP_BUSSES]; -int mp_bus_id_to_local [MAX_MP_BUSSES]; int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; static int mp_current_pci_id; diff --git a/trunk/arch/x86/pci/numa.c b/trunk/arch/x86/pci/numa.c index 3248d3ee388f..e765558f7e1b 100644 --- a/trunk/arch/x86/pci/numa.c +++ b/trunk/arch/x86/pci/numa.c @@ -12,6 +12,8 @@ #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ #define BUS2QUAD(global) (mp_bus_id_to_node[global]) + +int mp_bus_id_to_local[MAX_MP_BUSSES]; #define BUS2LOCAL(global) (mp_bus_id_to_local[global]) int quad_local_to_mp_bus_id [NR_CPUS/4][4]; diff --git a/trunk/include/asm-x86/mach-numaq/mach_mpparse.h b/trunk/include/asm-x86/mach-numaq/mach_mpparse.h index cd21f289e6b7..0917b95c42ac 100644 --- a/trunk/include/asm-x86/mach-numaq/mach_mpparse.h +++ b/trunk/include/asm-x86/mach-numaq/mach_mpparse.h @@ -1,6 +1,8 @@ #ifndef __ASM_MACH_MPPARSE_H #define __ASM_MACH_MPPARSE_H +extern int mp_bus_id_to_local[MAX_MP_BUSSES]; + static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, struct mpc_config_translation *translation) { diff --git a/trunk/include/asm-x86/mpspec.h b/trunk/include/asm-x86/mpspec.h index 5fa8b8bb7d00..1c52bd8711f6 100644 --- a/trunk/include/asm-x86/mpspec.h +++ b/trunk/include/asm-x86/mpspec.h @@ -7,7 +7,6 @@ #include extern int mp_bus_id_to_node[MAX_MP_BUSSES]; -extern int mp_bus_id_to_local[MAX_MP_BUSSES]; extern unsigned int def_to_bigsmp; extern int apic_version[MAX_APICS];