linux: another little bit of Kconfig cleanup

Remove useless things and make the <arch>_XEN/XEN option interaction
for x86 the same as it is for ia64/powerpc (which is more
appropriate).

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

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index e3d273876c0584ae62606d9c75fbb6108f627fdc..a632dab05e033f126db7e343270a59cd4cef334a 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -106,6 +106,7 @@ config X86_PC
 
 config X86_XEN
        bool "Xen-compatible"
+       select XEN
        select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
        select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
        select SWIOTLB

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 312f2155b5246c5fd65ff821fe8dbb90d4805547..3d49f9e6f36aa7006f802dba0c21648fa41561bb 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -137,6 +137,7 @@ endchoice
 
 config X86_64_XEN
        bool "Enable Xen compatible kernel"
+       select XEN
        select SWIOTLB
        help
          This option will compile a kernel compatible with Xen hypervisor

diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 577a280a64d63ba9f8a6bcea5e6f13e3eb790e89..06bf3ddea37bab95cfcc506bb6043a0cc75ff9b0 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -6,9 +6,6 @@ mainmenu "Xen Configuration"
 
 config XEN
        bool
-       default y if X86_XEN || X86_64_XEN
-       help
-         This is the Linux Xen port.
 
 if XEN
 config XEN_INTERFACE_VERSION
@@ -19,7 +16,6 @@ menu "XEN"
 
 config XEN_PRIVILEGED_GUEST
        bool "Privileged Guest (domain 0)"
-       default n
        help
          Support for privileged operation (domain 0)