---

yaml --- r: 329811 b: refs/heads/master c: f2a7434 h: refs/heads/master i: 329809: 7ac5bb0 329807: d5e384d v: v3
git-mirror · Jul 23, 2012 · a459ee6 · a459ee6
1 parent d742493
commit a459ee6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -21,3 +21,6 @@ config KVM_ASYNC_PF
 
 config HAVE_KVM_MSI
        bool
+
+config HAVE_KVM_CPU_RELAX_INTERCEPT
+       bool
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,6 @@ config KVM_ASYNC_PF @@
     config HAVE_KVM_MSI
            bool
+    config HAVE_KVM_CPU_RELAX_INTERCEPT
+           bool