ia64/xen-unstable
changeset 6627:b6c98fe62e1a
merge?
line diff
2.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c Sat Sep 03 18:48:39 2005 +0000 2.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c Sat Sep 03 18:48:59 2005 +0000 2.3 @@ -1633,8 +1633,8 @@ void __init setup_arch(char **cmdline_p) 2.4 } 2.5 #endif 2.6 2.7 - 2.8 - dmi_scan_machine(); 2.9 + if (xen_start_info.flags & SIF_INITDOMAIN) 2.10 + dmi_scan_machine(); 2.11 2.12 #ifdef CONFIG_X86_GENERICARCH 2.13 generic_apic_probe(*cmdline_p);