1.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Thu Mar 09 15:59:53 2006 +0100
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Thu Mar 09 16:03:23 2006 +0100
     1.3 @@ -108,6 +108,7 @@ CONFIG_MICROCODE=y
     1.4  CONFIG_X86_IO_APIC=y
     1.5  CONFIG_X86_XEN_GENAPIC=y
     1.6  CONFIG_X86_LOCAL_APIC=y
     1.7 +CONFIG_MTRR=y
     1.8  # CONFIG_SMP is not set
     1.9  CONFIG_PREEMPT_NONE=y
    1.10  # CONFIG_PREEMPT_VOLUNTARY is not set

     2.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Thu Mar 09 15:59:53 2006 +0100
     2.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Thu Mar 09 16:03:23 2006 +0100
     2.3 @@ -111,6 +111,7 @@ CONFIG_MICROCODE=y
     2.4  CONFIG_X86_IO_APIC=y
     2.5  CONFIG_X86_XEN_GENAPIC=y
     2.6  CONFIG_X86_LOCAL_APIC=y
     2.7 +CONFIG_MTRR=y
     2.8  CONFIG_SMP=y
     2.9  CONFIG_PREEMPT_NONE=y
    2.10  # CONFIG_PREEMPT_VOLUNTARY is not set

     3.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Thu Mar 09 15:59:53 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Thu Mar 09 16:03:23 2006 +0100
     3.3 @@ -222,7 +222,7 @@ config X86_LOCAL_APIC
     3.4  
     3.5  config MTRR
     3.6  	bool "MTRR (Memory Type Range Register) support"
     3.7 -	depends on !X86_64_XEN
     3.8 +	depends on !XEN_UNPRIVILEGED_GUEST
     3.9  	---help---
    3.10  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
    3.11  	  the Memory Type Range Registers (MTRRs) may be used to control