ia64/xen-unstable

changeset 6627:b6c98fe62e1a

merge?
author cl349@firebug.cl.cam.ac.uk
date Sat Sep 03 18:48:59 2005 +0000 (2005-09-03)
parents 2e2611af05c6 563732d616e4
children 523078a33287
files .hgignore linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c linux-2.6-xen-sparse/drivers/xen/xenbus/Makefile linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c linux-2.6-xen-sparse/include/asm-xen/linux-public/xenbus_dev.h linux-2.6-xen-sparse/mm/memory.c tools/firmware/rombios/rombios.c tools/firmware/vmxassist/Makefile tools/firmware/vmxassist/setup.c tools/firmware/vmxassist/vm86.c tools/firmware/vmxassist/vmxloader.c tools/ioemu/exec.c tools/ioemu/hw/pcnet.c tools/ioemu/target-i386-dm/helper2.c tools/ioemu/vl.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xenguest.h tools/python/xen/xend/XendCheckpoint.py tools/python/xen/xend/XendDomain.py tools/python/xen/xend/XendDomainInfo.py tools/xcutils/xc_restore.c tools/xcutils/xc_save.c tools/xenstore/Makefile tools/xenstore/xenstore_client.c tools/xenstore/xs.c tools/xenstore/xs.h tools/xenstore/xs_lib.c tools/xenstore/xs_lib.h xen/Rules.mk xen/arch/x86/vmx.c xen/arch/x86/vmx_intercept.c xen/arch/x86/vmx_io.c xen/arch/x86/vmx_platform.c xen/common/memory.c xen/include/asm-x86/vmx.h xen/include/asm-x86/vmx_platform.h xen/include/public/io/ioreq.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Sep 03 18:48:39 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Sep 03 18:48:59 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);