From: Matthew Dobson <colpatch@us.ibm.com>
Trying to build a kernel with both CONFIG_X86_GENERICARCH and
CONFIG_NUMA on results in a compile error. This patch fixes that build
problem by adding a config option for NUMA on Summit which is used to
correctly conditionally compile arch/i386/kernel/summit.c and properly
ifdef the function calls used in generic code. Please apply.
Running make -j24 bzImage
arch/i386/mach-generic/built-in.o: In function `mps_oem_check':
arch/i386/mach-generic/built-in.o(.text+0x3ce): undefined reference to
`setup_summit'
arch/i386/mach-generic/built-in.o: In function `acpi_madt_oem_check':
arch/i386/mach-generic/built-in.o(.text+0x468): undefined reference to
`setup_summit'
make: *** [.tmp_vmlinux1] Error 1
25-akpm/arch/i386/Kconfig | 11 ++++++++---
25-akpm/arch/i386/kernel/Makefile | 2 +-
25-akpm/arch/i386/kernel/summit.c | 4 +---
25-akpm/include/asm-i386/mach-summit/mach_mpparse.h | 6 +++---
25-akpm/include/asm-i386/mpspec.h | 4 ----
5 files changed, 13 insertions(+), 14 deletions(-)
diff -puN arch/i386/Kconfig~ia32-GENERIC_ARCH-NUMA-build-fix arch/i386/Kconfig
--- 25/arch/i386/Kconfig~ia32-GENERIC_ARCH-NUMA-build-fix Fri Dec 19 17:56:16 2003
+++ 25-akpm/arch/i386/Kconfig Fri Dec 19 17:56:16 2003
@@ -115,10 +115,15 @@ config ACPI_SRAT
default y
depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
+config X86_SUMMIT_NUMA
+ bool
+ default y
+ depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
+
config X86_CYCLONE_TIMER
- bool
- default y
- depends on X86_SUMMIT || X86_GENERICARCH
+ bool
+ default y
+ depends on X86_SUMMIT || X86_GENERICARCH
config ES7000_CLUSTERED_APIC
bool
diff -puN arch/i386/kernel/Makefile~ia32-GENERIC_ARCH-NUMA-build-fix arch/i386/kernel/Makefile
--- 25/arch/i386/kernel/Makefile~ia32-GENERIC_ARCH-NUMA-build-fix Fri Dec 19 17:56:16 2003
+++ 25-akpm/arch/i386/kernel/Makefile Fri Dec 19 17:56:16 2003
@@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse.o
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
obj-$(CONFIG_X86_NUMAQ) += numaq.o
-obj-$(CONFIG_X86_SUMMIT) += summit.o
+obj-$(CONFIG_X86_SUMMIT_NUMA) += summit.o
obj-$(CONFIG_EDD) += edd.o
obj-$(CONFIG_MODULES) += module.o
obj-y += sysenter.o vsyscall.o
diff -puN arch/i386/kernel/summit.c~ia32-GENERIC_ARCH-NUMA-build-fix arch/i386/kernel/summit.c
--- 25/arch/i386/kernel/summit.c~ia32-GENERIC_ARCH-NUMA-build-fix Fri Dec 19 17:56:16 2003
+++ 25-akpm/arch/i386/kernel/summit.c Fri Dec 19 17:56:16 2003
@@ -29,9 +29,8 @@
#include <linux/mm.h>
#include <linux/init.h>
#include <asm/io.h>
-#include <mach_mpparse.h>
+#include <asm/mach-summit/mach_mpparse.h>
-#ifdef CONFIG_NUMA
static void __init setup_pci_node_map_for_wpeg(int wpeg_num, struct rio_table_hdr *rth,
struct scal_detail **scal_nodes, struct rio_detail **rio_nodes){
int twst_num = 0, node = 0, first_bus = 0;
@@ -169,4 +168,3 @@ void __init setup_summit(void)
/* It's a Winnipeg, it's got PCI Busses */
setup_pci_node_map_for_wpeg(i, rio_table_hdr, scal_devs, rio_devs);
}
-#endif /* CONFIG_NUMA */
diff -puN include/asm-i386/mach-summit/mach_mpparse.h~ia32-GENERIC_ARCH-NUMA-build-fix include/asm-i386/mach-summit/mach_mpparse.h
--- 25/include/asm-i386/mach-summit/mach_mpparse.h~ia32-GENERIC_ARCH-NUMA-build-fix Fri Dec 19 17:56:16 2003
+++ 25-akpm/include/asm-i386/mach-summit/mach_mpparse.h Fri Dec 19 17:56:16 2003
@@ -5,11 +5,11 @@
extern int use_cyclone;
-#ifdef CONFIG_NUMA
+#ifdef CONFIG_X86_SUMMIT_NUMA
extern void setup_summit(void);
-#else /* !CONFIG_NUMA */
+#else
#define setup_summit() {}
-#endif /* CONFIG_NUMA */
+#endif
static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
struct mpc_config_translation *translation)
diff -puN include/asm-i386/mpspec.h~ia32-GENERIC_ARCH-NUMA-build-fix include/asm-i386/mpspec.h
--- 25/include/asm-i386/mpspec.h~ia32-GENERIC_ARCH-NUMA-build-fix Fri Dec 19 17:56:16 2003
+++ 25-akpm/include/asm-i386/mpspec.h Fri Dec 19 17:56:16 2003
@@ -27,10 +27,6 @@ extern unsigned long mp_lapic_addr;
extern int pic_mode;
extern int using_apic_timer;
-#ifdef CONFIG_X86_SUMMIT
-extern void setup_summit (void);
-#endif
-
#ifdef CONFIG_ACPI_BOOT
extern void mp_register_lapic (u8 id, u8 enabled);
extern void mp_register_lapic_address (u64 address);
_