[Xen-devel] [PATCH] linux: some Kconfig adjustments

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

As usual, written and tested on 2.6.26 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2008-08-07/arch/i386/Kconfig
===================================================================
--- head-2008-08-07.orig/arch/i386/Kconfig      2008-08-07 13:14:47.000000000 
+0200
+++ head-2008-08-07/arch/i386/Kconfig   2008-08-07 13:50:49.000000000 +0200
@@ -397,7 +397,7 @@ config I8K
 
 config X86_REBOOTFIXUPS
        bool "Enable X86 board specific fixups for reboot"
-       depends on X86
+       depends on !X86_XEN
        default n
        ---help---
          This enables chipset and/or board specific fixups to be done
@@ -661,7 +661,6 @@ config MATH_EMULATION
 config MTRR
        bool "MTRR (Memory Type Range Register) support"
        depends on !XEN_UNPRIVILEGED_GUEST
-       default y if X86_XEN
        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control
@@ -781,6 +780,7 @@ config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        depends on HIGHMEM
+       depends on !XEN
        help
          Generate crash dump after being started by kexec.
 
Index: head-2008-08-07/drivers/char/Kconfig
===================================================================
--- head-2008-08-07.orig/drivers/char/Kconfig   2008-08-07 13:10:13.000000000 
+0200
+++ head-2008-08-07/drivers/char/Kconfig        2008-08-07 13:50:49.000000000 
+0200
@@ -1005,7 +1005,7 @@ config MAX_RAW_DEVS
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
-       depends on ACPI
+       depends on ACPI && !XEN
        help
          If you say Y here, you will have a miscdevice named "/dev/hpet/".  
Each
          open selects one of the timers supported by the HPET.  The timers are
Index: head-2008-08-07/drivers/video/Kconfig
===================================================================
--- head-2008-08-07.orig/drivers/video/Kconfig  2008-08-07 13:10:14.000000000 
+0200
+++ head-2008-08-07/drivers/video/Kconfig       2008-08-07 13:50:49.000000000 
+0200
@@ -1254,7 +1254,7 @@ config FB_CYBLA
        tristate "Cyberblade/i1 support"
        depends on FB && PCI && X86_32 && !64BIT
        select FB_CFB_IMAGEBLIT
-       select VIDEO_SELECT
+       select VIDEO_SELECT if !XEN
        ---help---
          This driver is supposed to support the Trident Cyberblade/i1
          graphics core integrated in the VIA VT8601A North Bridge,




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel