ia64/xen-unstable

changeset 6623:dbded18962a4

merge
author iap10@firebug.cl.cam.ac.uk
date Sat Sep 03 18:15:39 2005 +0000 (2005-09-03)
parents ce018d2730c0 62af59588060
children 29808fef9148
files linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c xen/Rules.mk xen/arch/x86/shadow.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Sep 03 16:33:53 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Sep 03 18:15:39 2005 +0000
     1.3 @@ -1633,8 +1633,8 @@ void __init setup_arch(char **cmdline_p)
     1.4  	}
     1.5  #endif
     1.6  
     1.7 -
     1.8 -	dmi_scan_machine();
     1.9 +	if (xen_start_info.flags & SIF_INITDOMAIN)
    1.10 +		dmi_scan_machine();
    1.11  
    1.12  #ifdef CONFIG_X86_GENERICARCH
    1.13  	generic_apic_probe(*cmdline_p);
     2.1 --- a/xen/Rules.mk	Sat Sep 03 16:33:53 2005 +0000
     2.2 +++ b/xen/Rules.mk	Sat Sep 03 18:15:39 2005 +0000
     2.3 @@ -3,7 +3,7 @@
     2.4  # 'make clean' before rebuilding.
     2.5  #
     2.6  verbose     ?= y
     2.7 -debug       ?= n
     2.8 +debug       ?= y
     2.9  perfc       ?= n
    2.10  perfc_arrays?= n
    2.11  trace       ?= n