summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 10:47:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 10:47:39 -0700
commitda1ba891f22835db9a2c349315c3763e9f4e4e67 (patch)
tree958c53bfbe540c14370709d64c538e5c3f6cff2b /arch/s390/kvm/Kconfig
parent8b2cc917a02936c3ea7d8da46801c7b7b6233093 (diff)
parent45e576b1c3d0020607b8666c0247164e92c7d719 (diff)
downloadlinux-da1ba891f22835db9a2c349315c3763e9f4e4e67.tar.bz2
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] guest page hinting light [S390] tty3270: fix put_char fail/success conversion. [S390] compat ptrace cleanup [S390] s390mach compile warning [S390] cio: Fix parsing mechanism for blacklisted devices. [S390] cio: Remove cio_msg kernel parameter. [S390] s390-kvm: leave sie context on work. Removes preemption requirement [S390] s390: Optimize user and work TIF check
Diffstat (limited to 'arch/s390/kvm/Kconfig')
-rw-r--r--arch/s390/kvm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 1761b74d639b..e051cad1f1e0 100644
--- 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