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

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1267172062 0
# Node ID 75bb7e5fc20725cf1a15d6408e4ac2b4cd0f848b
# Parent  3b046e77d9b4aa588c0a04f2ed706a04a3c78a6a
x86_32: Fix build after 20983:94535cc63835

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20984:bb7164fc680a
xen-unstable date:        Fri Feb 26 08:13:02 2010 +0000
---
 xen/arch/x86/srat.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff -r 3b046e77d9b4 -r 75bb7e5fc207 xen/arch/x86/srat.c
--- a/xen/arch/x86/srat.c       Thu Feb 25 21:07:11 2010 +0000
+++ b/xen/arch/x86/srat.c       Fri Feb 26 08:14:22 2010 +0000
@@ -98,6 +98,7 @@ static __init inline int srat_disabled(v
        return numa_off || acpi_numa < 0;
 }
 
+#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
@@ -124,7 +125,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. "
@@ -139,8 +139,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