[Xen-changelog] merge?

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID b6c98fe62e1a35d8eb6e37af834eabddd7e3dd6f
# Parent  2e2611af05c62a45acf46f1a14891c29ba970108
# Parent  563732d616e4ba24b7c59fdf560398daf1968427
merge?

diff -r 2e2611af05c6 -r b6c98fe62e1a 
linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c Sat Sep  3 18:48:39 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c Sat Sep  3 18:48:59 2005
@@ -1633,8 +1633,8 @@
        }
 #endif
 
-
-       dmi_scan_machine();
+       if (xen_start_info.flags & SIF_INITDOMAIN)
+               dmi_scan_machine();
 
 #ifdef CONFIG_X86_GENERICARCH
        generic_apic_probe(*cmdline_p);

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