Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / arch / s390 / kvm / Kconfig

diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 2489b341a00bbdfff6700c0c40dbe93c4f0689ad..e051cad1f1e09d9f880b91f0d23b7738e10a5a57 100644 (file)
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -22,7 +22,6 @@ config KVM
        select PREEMPT_NOTIFIERS
        select ANON_INODES
        select S390_SWITCH_AMODE
-       select PREEMPT
        ---help---
          Support hosting paravirtualized guest machines using the SIE
          virtualization capability on the mainframe. This should work
@@ -36,6 +35,9 @@ config KVM
 
          If unsure, say N.
 
+config KVM_TRACE
+       bool
+
 # OK, it's a little counter-intuitive to do this, but it puts it neatly under
 # the virtualization menu.
 source drivers/virtio/Kconfig