Преглед изворни кода

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>
Eduardo Pereira Habkost пре 17 година
родитељ
комит
42d545c9a4
3 измењених фајлова са 4 додато и 2 уклоњено
  1. 2 2
      arch/x86/Kconfig
  2. 1 0
      arch/x86/lguest/Kconfig
  3. 1 0
      arch/x86/xen/Kconfig

+ 2 - 2
arch/x86/Kconfig

@@ -312,7 +312,6 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
 
 
 menuconfig PARAVIRT_GUEST
 menuconfig PARAVIRT_GUEST
 	bool "Paravirtualized guest support"
 	bool "Paravirtualized guest support"
-	depends on X86_32
 	help
 	help
 	  Say Y here to get to see options related to running Linux under
 	  Say Y here to get to see options related to running Linux under
 	  various hypervisors.  This option alone does not add any kernel code.
 	  various hypervisors.  This option alone does not add any kernel code.
@@ -326,6 +325,7 @@ source "arch/x86/xen/Kconfig"
 config VMI
 config VMI
 	bool "VMI Guest support"
 	bool "VMI Guest support"
 	select PARAVIRT
 	select PARAVIRT
+	depends on X86_32
 	depends on !(X86_VISWS || X86_VOYAGER)
 	depends on !(X86_VISWS || X86_VOYAGER)
 	help
 	help
 	  VMI provides a paravirtualized interface to the VMware ESX server
 	  VMI provides a paravirtualized interface to the VMware ESX server
@@ -337,7 +337,7 @@ source "arch/x86/lguest/Kconfig"
 
 
 config PARAVIRT
 config PARAVIRT
 	bool "Enable paravirtualization code"
 	bool "Enable paravirtualization code"
-	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+	depends on !(X86_VISWS || X86_VOYAGER)
 	help
 	help
 	  This changes the kernel so it can modify itself when it is run
 	  This changes the kernel so it can modify itself when it is run
 	  under a hypervisor, potentially improving performance significantly
 	  under a hypervisor, potentially improving performance significantly

+ 1 - 0
arch/x86/lguest/Kconfig

@@ -1,6 +1,7 @@
 config LGUEST_GUEST
 config LGUEST_GUEST
 	bool "Lguest guest support"
 	bool "Lguest guest support"
 	select PARAVIRT
 	select PARAVIRT
+	depends on X86_32
 	depends on !X86_PAE
 	depends on !X86_PAE
 	depends on !(X86_VISWS || X86_VOYAGER)
 	depends on !(X86_VISWS || X86_VOYAGER)
 	select VIRTIO
 	select VIRTIO

+ 1 - 0
arch/x86/xen/Kconfig

@@ -5,6 +5,7 @@
 config XEN
 config XEN
 	bool "Xen guest support"
 	bool "Xen guest support"
 	select PARAVIRT
 	select PARAVIRT
+	depends on X86_32
 	depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)
 	depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)
 	help
 	help
 	  This is the Linux Xen port.  Enabling this will allow the
 	  This is the Linux Xen port.  Enabling this will allow the