summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2012-07-25 15:53:49 +0800
committerTony Luck <tony.luck@intel.com>2012-07-25 11:45:31 -0700
commit0c406643d9f1a9071aa44045f897bce087fe3945 (patch)
tree3b133b780684b6ade947d363e873e081c094c637
parent28a33cbc24e4256c143dce96c7d93bf423229f92 (diff)
downloadop-kernel-dev-0c406643d9f1a9071aa44045f897bce087fe3945.zip
op-kernel-dev-0c406643d9f1a9071aa44045f897bce087fe3945.tar.gz
[IA64] Mark PARAVIRT and KVM as broken
Well, this at least makes allmodconfig happy. Proposed-by: David Howells <dhowells@redhat.com> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/ia64/kvm/Kconfig1
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8186ec5..310cf57 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -126,6 +126,7 @@ config AUDIT_ARCH
menuconfig PARAVIRT_GUEST
bool "Paravirtualized guest support"
+ depends on BROKEN
help
Say Y here to get to see options related to running Linux under
various hypervisors. This option alone does not add any kernel code.
@@ -138,8 +139,6 @@ config PARAVIRT
bool "Enable paravirtualization code"
depends on PARAVIRT_GUEST
default y
- bool
- default y
help
This changes the kernel so it can modify itself when it is run
under a hypervisor, potentially improving performance significantly
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index 9806e55..8ca8e35 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -22,6 +22,7 @@ config KVM
depends on HAVE_KVM && MODULES && EXPERIMENTAL
# for device assignment:
depends on PCI
+ depends on BROKEN
select PREEMPT_NOTIFIERS
select ANON_INODES
select HAVE_KVM_IRQCHIP
OpenPOWER on IntegriCloud