aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Pereira Habkost <ehabkost@redhat.com>2008-01-30 07:33:32 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:32 -0500
commit42d545c9a4c0d3faeab658a40165c3da2dda91b2 (patch)
treebd7d188d779f9372f5aedd4654804c37bc94447d
parente61bd94a36a9f2c394d75ebe3614fe0a612bcf2d (diff)
x86: remove depends on X86_32 from PARAVIRT & PARAVIRT_GUEST
With this, the paravirt_ops code can be enabled on x86_64 also. Each guest implementation (Xen, VMI, lguest) now depends on X86_32. The dependencies can be dropped for each one when they start to support x86_64. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/Kconfig4
-rw-r--r--arch/x86/lguest/Kconfig1
-rw-r--r--arch/x86/xen/Kconfig1
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5e0cde8294c9..f0887d12a5bb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -312,7 +312,6 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
312 312
313menuconfig PARAVIRT_GUEST 313menuconfig PARAVIRT_GUEST
314 bool "Paravirtualized guest support" 314 bool "Paravirtualized guest support"
315 depends on X86_32
316 help 315 help
317 Say Y here to get to see options related to running Linux under 316 Say Y here to get to see options related to running Linux under
318 various hypervisors. This option alone does not add any kernel code. 317 various hypervisors. This option alone does not add any kernel code.
@@ -326,6 +325,7 @@ source "arch/x86/xen/Kconfig"
326config VMI 325config VMI
327 bool "VMI Guest support" 326 bool "VMI Guest support"
328 select PARAVIRT 327 select PARAVIRT
328 depends on X86_32
329 depends on !(X86_VISWS || X86_VOYAGER) 329 depends on !(X86_VISWS || X86_VOYAGER)
330 help 330 help
331 VMI provides a paravirtualized interface to the VMware ESX server 331 VMI provides a paravirtualized interface to the VMware ESX server
@@ -337,7 +337,7 @@ source "arch/x86/lguest/Kconfig"
337 337
338config PARAVIRT 338config PARAVIRT
339 bool "Enable paravirtualization code" 339 bool "Enable paravirtualization code"
340 depends on X86_32 && !(X86_VISWS || X86_VOYAGER) 340 depends on !(X86_VISWS || X86_VOYAGER)
341 help 341 help
342 This changes the kernel so it can modify itself when it is run 342 This changes the kernel so it can modify itself when it is run
343 under a hypervisor, potentially improving performance significantly 343 under a hypervisor, potentially improving performance significantly
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 19626ace0f50..964dfa36d367 100644
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -1,6 +1,7 @@
1config LGUEST_GUEST 1config LGUEST_GUEST
2 bool "Lguest guest support" 2 bool "Lguest guest support"
3 select PARAVIRT 3 select PARAVIRT
4 depends on X86_32
4 depends on !X86_PAE 5 depends on !X86_PAE
5 depends on !(X86_VISWS || X86_VOYAGER) 6 depends on !(X86_VISWS || X86_VOYAGER)
6 select VIRTIO 7 select VIRTIO
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index fbfa55ce0d55..4d5f2649bee4 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -5,6 +5,7 @@
5config XEN 5config XEN
6 bool "Xen guest support" 6 bool "Xen guest support"
7 select PARAVIRT 7 select PARAVIRT
8 depends on X86_32
8 depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER) 9 depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)
9 help 10 help
10 This is the Linux Xen port. Enabling this will allow the 11 This is the Linux Xen port. Enabling this will allow the