aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-02-26 08:13:02 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-02-26 08:13:02 +0000
commit02ea486f8e0392fbe36e3869c2bb8021541d2cc1 (patch)
treedfe65fc676c5a9c097de5a896d3bd0568b5acffd
parent387d25611007aa702df6c3c78fdcaaf7644947e7 (diff)
downloadxen-02ea486f8e0392fbe36e3869c2bb8021541d2cc1.tar.gz
xen-02ea486f8e0392fbe36e3869c2bb8021541d2cc1.tar.bz2
xen-02ea486f8e0392fbe36e3869c2bb8021541d2cc1.zip
x86_32: Fix build after 20983:94535cc63835
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r--xen/arch/x86/srat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 2060ff78cc..b89c58805e 100644
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -114,6 +114,7 @@ static __init void bad_srat(void)
apicid_to_node[i] = NUMA_NO_NODE;
}
+#ifdef CONFIG_X86_64
/*
* A lot of BIOS fill in 10 (= no distance) everywhere. This messes
* up the NUMA heuristics which wants the local node to have a smaller
@@ -140,7 +141,6 @@ static __init int slit_valid(struct acpi_table_slit *slit)
/* Callback for SLIT parsing */
void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
{
-#ifdef CONFIG_X86_64
unsigned long mfn;
if (!slit_valid(slit)) {
printk(KERN_INFO "ACPI: SLIT table looks invalid. "
@@ -155,8 +155,12 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
}
acpi_slit = mfn_to_virt(mfn);
memcpy(acpi_slit, slit, slit->header.length);
-#endif
}
+#else
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+{
+}
+#endif
/* Callback for Proximity Domain -> LAPIC mapping */
void __init