Merge branch 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[karo-tx-linux.git] / arch / s390 / kvm / Kconfig

diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 2f4b687cc7fa094f943daf925bd07c27204c717a..a7251580891cfef25483e683460d58f498eb65b6 100644 (file)
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -33,17 +33,6 @@ config KVM
 
          If unsure, say N.
 
-config KVM_AWARE_CMF
-       depends on KVM
-       bool "KVM aware sampling"
-       ---help---
-         This option enhances the sampling data from the CPU Measurement
-         Facility with additional information, that allows to distinguish
-         guest(s) and host when using the kernel based virtual machine
-         functionality.
-
-         If unsure, say N.
-
 # OK, it's a little counter-intuitive to do this, but it puts it neatly under
 # the virtualization menu.
 source drivers/vhost/Kconfig