ia64/xen-unstable

changeset 7138:7f732bba3ed4

Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used as a guest kernel on x86_64
Signed-off-by: ian@xensource.com
author iap10@firebug.cl.cam.ac.uk
date Thu Sep 29 19:59:18 2005 +0100 (2005-09-29)
parents f529cd119470
children d88e98fd4f7a
files linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Thu Sep 29 18:28:28 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c	Thu Sep 29 19:59:18 2005 +0100
     1.3 @@ -771,11 +771,14 @@ void __init setup_arch(char **cmdline_p)
     1.4  				virt_to_mfn(&phys_to_machine_mapping[i]);
     1.5  		}
     1.6  		HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
     1.7 -		
     1.8 -		
     1.9 +	}
    1.10  
    1.11 -
    1.12 -
    1.13 +	if ( ! (xen_start_info->flags & SIF_INITDOMAIN))
    1.14 +	{
    1.15 +		acpi_disabled = 1;
    1.16 +#ifdef  CONFIG_ACPI_BOOT
    1.17 +		acpi_ht = 0;
    1.18 +#endif
    1.19  	}
    1.20  #endif
    1.21