summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-29 11:29:22 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-29 14:16:41 +0100
commit7c20dcc545d78946e40e8fab99637fe815b1d211 (patch)
treed53e3a9e8504e7b01d649702a2b164053b6539d4 /arch
parentx86, summit: consolidate code (diff)
downloadlinux-7c20dcc545d78946e40e8fab99637fe815b1d211.tar.xz
linux-7c20dcc545d78946e40e8fab99637fe815b1d211.zip
x86, summit: consolidate code, fix
Build fix for !NUMA Summit. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/Makefile2
-rw-r--r--arch/x86/kernel/summit_32.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 37fa30bada17..a382ca6f6a17 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -73,7 +73,7 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_ES7000) += es7000_32.o
-obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
+obj-$(CONFIG_X86_SUMMIT) += summit_32.o
obj-y += vsmp_64.o
obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_MODULES) += module_$(BITS).o
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index 3b60dd5e57fa..84ff9ebbcc97 100644
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -389,6 +389,7 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)
*retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };
}
+#ifdef CONFIG_X86_SUMMIT_NUMA
static struct rio_table_hdr *rio_table_hdr __initdata;
static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
@@ -543,7 +544,7 @@ void __init setup_summit(void)
next_wpeg = 0;
} while (next_wpeg != 0);
}
-
+#endif
struct genapic apic_summit = {