From a459ee685ae3454e475bfbe2a1d83ebc608e2325 Mon Sep 17 00:00:00 2001 From: Raghavendra K T Date: Wed, 18 Jul 2012 19:07:32 +0530 Subject: [PATCH] --- yaml --- r: 329811 b: refs/heads/master c: f2a743473194a1ad44a85f8b63aeef9d63e5bf47 h: refs/heads/master i: 329809: 7ac5bb0eaeb64e6db16cd54fad20f1a0397ca18a 329807: d5e384d412e70052ad3a3c1a14f4f3d811f8b02f v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/Kconfig | 1 + trunk/arch/x86/kvm/Kconfig | 1 + trunk/virt/kvm/Kconfig | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c6aa6c0f30f0..c8b124d02b41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93b6547e2219784b2df790353e083e0bdbebd2c2 +refs/heads/master: f2a743473194a1ad44a85f8b63aeef9d63e5bf47 diff --git a/trunk/arch/s390/kvm/Kconfig b/trunk/arch/s390/kvm/Kconfig index 78eb9847008f..a6e2677724e1 100644 --- a/trunk/arch/s390/kvm/Kconfig +++ b/trunk/arch/s390/kvm/Kconfig @@ -21,6 +21,7 @@ config KVM depends on HAVE_KVM && EXPERIMENTAL select PREEMPT_NOTIFIERS select ANON_INODES + select HAVE_KVM_CPU_RELAX_INTERCEPT ---help--- Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work diff --git a/trunk/arch/x86/kvm/Kconfig b/trunk/arch/x86/kvm/Kconfig index a28f338843ea..45c044f0fff7 100644 --- a/trunk/arch/x86/kvm/Kconfig +++ b/trunk/arch/x86/kvm/Kconfig @@ -37,6 +37,7 @@ config KVM select TASK_DELAY_ACCT select PERF_EVENTS select HAVE_KVM_MSI + select HAVE_KVM_CPU_RELAX_INTERCEPT ---help--- Support hosting fully virtualized guest machines using hardware virtualization extensions. You will need a fairly recent diff --git a/trunk/virt/kvm/Kconfig b/trunk/virt/kvm/Kconfig index 28694f4a9139..d01b24b72c61 100644 --- a/trunk/virt/kvm/Kconfig +++ b/trunk/virt/kvm/Kconfig @@ -21,3 +21,6 @@ config KVM_ASYNC_PF config HAVE_KVM_MSI bool + +config HAVE_KVM_CPU_RELAX_INTERCEPT + bool