---

yaml --- r: 113487 b: refs/heads/master c: 927604c h: refs/heads/master i: 113485: a4a4e40 113483: 2543581 113479: f601f99 113471: af2b897 v: v3
git-mirror · Oct 13, 2008 · 7ef3ae9 · 7ef3ae9
1 parent 4ea7a3e
commit 7ef3ae9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cefa5b9b0a61b62442c5d0ca00a304c5896b6e9
+refs/heads/master: 927604c7592473742891dc13e1da09febc06e01b
diff --git a/trunk/arch/x86/mm/Makefile b/trunk/arch/x86/mm/Makefile
@@ -13,12 +13,8 @@ obj-$(CONFIG_MMIOTRACE)		+= mmiotrace.o
 mmiotrace-y			:= pf_in.o mmio-mod.o
 obj-$(CONFIG_MMIOTRACE_TEST)	+= testmmiotrace.o
 
-ifeq ($(CONFIG_X86_32),y)
-obj-$(CONFIG_NUMA)		+= discontig_32.o
-else
-obj-$(CONFIG_NUMA)		+= numa_64.o
+obj-$(CONFIG_NUMA)		+= numa_$(BITS).o
 obj-$(CONFIG_K8_NUMA)		+= k8topology_64.o
-endif
 obj-$(CONFIG_ACPI_NUMA)		+= srat_$(BITS).o
 
 obj-$(CONFIG_MEMTEST)		+= memtest.o
diff --git a/trunk/arch/x86/mm/discontig_32.c → trunk/arch/x86/mm/numa_32.c b/trunk/arch/x86/mm/discontig_32.c → trunk/arch/x86/mm/numa_32.c