# HG changeset patch
# User iap10@firebug.cl.cam.ac.uk
# Date 1125771339 0
# Node ID dbded18962a406db5cebcc191dbe255f5f562160
# Parent  ce018d2730c037b9d8e1a60c56328aebca5bfc48# Parent  62af595880604c8e741d8530377500dc06508234
merge


diff -r ce018d2730c0 -r dbded18962a4 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 03 16:33:53 2005 +0000
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Sep 03 18:15:39 2005 +0000
@@ -1633,8 +1633,8 @@ void __init setup_arch(char **cmdline_p)
 	}
 #endif
 
-
-	dmi_scan_machine();
+	if (xen_start_info.flags & SIF_INITDOMAIN)
+		dmi_scan_machine();
 
 #ifdef CONFIG_X86_GENERICARCH
 	generic_apic_probe(*cmdline_p);
diff -r ce018d2730c0 -r dbded18962a4 xen/Rules.mk
--- a/xen/Rules.mk	Sat Sep 03 16:33:53 2005 +0000
+++ b/xen/Rules.mk	Sat Sep 03 18:15:39 2005 +0000
@@ -3,7 +3,7 @@
 # 'make clean' before rebuilding.
 #
 verbose     ?= y
-debug       ?= n
+debug       ?= y
 perfc       ?= n
 perfc_arrays?= n
 trace       ?= n
diff -r ce018d2730c0 -r dbded18962a4 xen/arch/x86/shadow.c