[Xen-changelog] [xen-unstable] x86_32: Fix build after 20983:94535cc63835

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267171982 0
# Node ID bb7164fc680a2cb0253d7e4dfaacf0466fa687e4
# Parent  94535cc638355c1981c10626f720df97f7c99f55
x86_32: Fix build after 20983:94535cc63835

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/srat.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff -r 94535cc63835 -r bb7164fc680a xen/arch/x86/srat.c
--- a/xen/arch/x86/srat.c       Thu Feb 25 21:03:26 2010 +0000
+++ b/xen/arch/x86/srat.c       Fri Feb 26 08:13:02 2010 +0000
@@ -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
 /* 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 a
        }
        acpi_slit = mfn_to_virt(mfn);
        memcpy(acpi_slit, slit, slit->header.length);
+}
+#else
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+{
+}
 #endif
-}
 
 /* Callback for Proximity Domain -> LAPIC mapping */
 void __init

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog