ia64/xen-unstable

changeset 19747:7f9286d21706

x86: Switch to using pvops kernel by default for Linux

Keave ia64 on 2.6.18 since it currently has no dom0 support in pvops

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jun 16 11:15:48 2009 +0100 (2009-06-16)
parents 6e2f1bba71e9
children 8373971089a7
files buildconfigs/enable-xen-config config/Linux.mk
line diff
     1.1 --- a/buildconfigs/enable-xen-config	Tue Jun 16 11:11:59 2009 +0100
     1.2 +++ b/buildconfigs/enable-xen-config	Tue Jun 16 11:15:48 2009 +0100
     1.3 @@ -45,7 +45,8 @@ setopt CONFIG_HVC_XEN y
     1.4  setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32
     1.5  setopt CONFIG_XEN_DEBUG_FS y
     1.6  setopt CONFIG_XEN_DOM0 y
     1.7 -
     1.8 +setopt CONFIG_XEN_SYS_HYPERVISOR y
     1.9 +setopt CONFIG_XEN_GNTDEV y
    1.10  setopt CONFIG_VMI y
    1.11  
    1.12  setopt CONFIG_KVM y
    1.13 @@ -72,6 +73,9 @@ setopt CONFIG_DMAR n
    1.14  setopt CONFIG_INTR_REMAP n
    1.15  setopt CONFIG_GFS2_FS n
    1.16  setopt CONFIG_IOMMU_DEBUG n
    1.17 +setopt CONFIG_X86_MCE_INTEL n
    1.18 +setopt CONFIG_X86_MCE_AMD n
    1.19 +setopt CONFIG_CRYPTO_AES_NI_INTEL n
    1.20  
    1.21  case ${XEN_TARGET_ARCH} in
    1.22      x86_32) setopt CONFIG_64BIT n ;;
     2.1 --- a/config/Linux.mk	Tue Jun 16 11:11:59 2009 +0100
     2.2 +++ b/config/Linux.mk	Tue Jun 16 11:15:48 2009 +0100
     2.3 @@ -1,7 +1,11 @@
     2.4  include $(XEN_ROOT)/config/StdGNU.mk
     2.5  
     2.6  # You may use wildcards, e.g. KERNELS=*2.6*
     2.7 +ifeq (ia64,$(XEN_TARGET_ARCH))
     2.8  KERNELS ?= linux-2.6-xen
     2.9 +else
    2.10 +KERNELS ?= linux-2.6-pvops
    2.11 +endif
    2.12  
    2.13  XKERNELS := $(foreach kernel, $(KERNELS), \
    2.14                $(patsubst buildconfigs/mk.%,%, \