From 74926b65e554ca0113e113c9e3bd7f0725116cf0 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 2 May 2011 14:18:52 +0200 Subject: [PATCH] --- yaml --- r: 245702 b: refs/heads/master c: 7b2600f8ee0536bb738f3387cf2c30e8e334e149 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/Makefile | 5 ++++- trunk/arch/x86/mm/{srat_64.c => srat.c} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename trunk/arch/x86/mm/{srat_64.c => srat.c} (100%) diff --git a/[refs] b/[refs] index 18c6e7b78382..8370a59da69e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1201e10a092adc9c88a6ce5f27740cc5cd0d26e5 +refs/heads/master: 7b2600f8ee0536bb738f3387cf2c30e8e334e149 diff --git a/trunk/arch/x86/mm/Makefile b/trunk/arch/x86/mm/Makefile index 3e608edf9958..37e7043362a1 100644 --- a/trunk/arch/x86/mm/Makefile +++ b/trunk/arch/x86/mm/Makefile @@ -24,7 +24,10 @@ obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o obj-$(CONFIG_NUMA) += numa.o numa_$(BITS).o obj-$(CONFIG_AMD_NUMA) += amdtopology_64.o -obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o +ifeq ($(CONFIG_ACPI_NUMA),y) +obj-$(CONFIG_X86_64) += srat.o +obj-$(CONFIG_X86_32) += srat_32.o +endif obj-$(CONFIG_NUMA_EMU) += numa_emulation.o obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat.c similarity index 100% rename from trunk/arch/x86/mm/srat_64.c rename to trunk/arch/x86/mm/srat.c