diff options
author | Fengguang Wu <fengguang.wu@intel.com> | 2012-07-25 03:53:49 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2012-07-25 14:45:31 -0400 |
commit | 0c406643d9f1a9071aa44045f897bce087fe3945 (patch) | |
tree | 3b133b780684b6ade947d363e873e081c094c637 /arch | |
parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 3 | ||||
-rw-r--r-- | arch/ia64/kvm/Kconfig | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 8186ec5ea151..310cf5781fad 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -126,6 +126,7 @@ config AUDIT_ARCH | |||
126 | 126 | ||
127 | menuconfig PARAVIRT_GUEST | 127 | menuconfig PARAVIRT_GUEST |
128 | bool "Paravirtualized guest support" | 128 | bool "Paravirtualized guest support" |
129 | depends on BROKEN | ||
129 | help | 130 | help |
130 | Say Y here to get to see options related to running Linux under | 131 | Say Y here to get to see options related to running Linux under |
131 | various hypervisors. This option alone does not add any kernel code. | 132 | various hypervisors. This option alone does not add any kernel code. |
@@ -138,8 +139,6 @@ config PARAVIRT | |||
138 | bool "Enable paravirtualization code" | 139 | bool "Enable paravirtualization code" |
139 | depends on PARAVIRT_GUEST | 140 | depends on PARAVIRT_GUEST |
140 | default y | 141 | default y |
141 | bool | ||
142 | default y | ||
143 | help | 142 | help |
144 | This changes the kernel so it can modify itself when it is run | 143 | This changes the kernel so it can modify itself when it is run |
145 | under a hypervisor, potentially improving performance significantly | 144 | under a hypervisor, potentially improving performance significantly |
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 9806e55f91be..8ca8e353487d 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig | |||
@@ -22,6 +22,7 @@ config KVM | |||
22 | depends on HAVE_KVM && MODULES && EXPERIMENTAL | 22 | depends on HAVE_KVM && MODULES && EXPERIMENTAL |
23 | # for device assignment: | 23 | # for device assignment: |
24 | depends on PCI | 24 | depends on PCI |
25 | depends on BROKEN | ||
25 | select PREEMPT_NOTIFIERS | 26 | select PREEMPT_NOTIFIERS |
26 | select ANON_INODES | 27 | select ANON_INODES |
27 | select HAVE_KVM_IRQCHIP | 28 | select HAVE_KVM_IRQCHIP |