From 5cc7f3293fb691cb8c99b6e8f7c9564feaf2f4ed Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Dec 2003 23:43:28 -0800 Subject: [PATCH] [PATCH] Fix X86_GENERICARCH & NUMA compile error From: Matthew Dobson 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 --- arch/i386/Kconfig | 11 ++++++++--- arch/i386/kernel/Makefile | 2 +- arch/i386/kernel/summit.c | 4 +--- include/asm-i386/mach-summit/mach_mpparse.h | 6 +++--- include/asm-i386/mpspec.h | 4 ---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index ca778debd0965..de830f5b8102f 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -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 --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 1b74c7e5c2d68..6214b3b62e4d8 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -24,7 +24,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 --git a/arch/i386/kernel/summit.c b/arch/i386/kernel/summit.c index 85631359c808e..1f049a5503335 100644 --- a/arch/i386/kernel/summit.c +++ b/arch/i386/kernel/summit.c @@ -29,9 +29,8 @@ #include #include #include -#include +#include -#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 --git a/include/asm-i386/mach-summit/mach_mpparse.h b/include/asm-i386/mach-summit/mach_mpparse.h index 88d215ad7bdec..e0b60053b9eac 100644 --- a/include/asm-i386/mach-summit/mach_mpparse.h +++ b/include/asm-i386/mach-summit/mach_mpparse.h @@ -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 --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h index a4ee37cade68c..55bd3075d68f6 100644 --- a/include/asm-i386/mpspec.h +++ b/include/asm-i386/mpspec.h @@ -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); -- 2.53.0