[S390] spp: remove KVM_AWARE_CMF config option

This config option enables or disables three single instructions
which aren't expensive. This is too fine grained.
Besided that everybody who uses kvm would enable it anyway in order
to debug performance problems.
Just remove it.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 178d92536d903864999f18b8ece299d4c0a8446a..e7192e1cb6785b24db347b2bbe2c22a469bdeb7d 100644 (file)
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -65,7 +65,7 @@ _TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
        ltgr    %r3,%r3
        jz      0f
        basr    %r14,%r3
-       0:
+0:
 #endif
        .endm
 

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

diff --git a/arch/s390/kvm/sie64a.S b/arch/s390/kvm/sie64a.S
index 31646bd0e469a6db61f2386de29a2da0bb2b0e0f..7e9d30d567b0ab21265b669f1f343018d10de080 100644 (file)
--- a/arch/s390/kvm/sie64a.S
+++ b/arch/s390/kvm/sie64a.S
@@ -32,12 +32,10 @@ SPI_PSW  = STACK_FRAME_OVERHEAD + __PT_PSW
 
 
        .macro SPP newpp
-#ifdef CONFIG_KVM_AWARE_CMF
        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
        jz      0f
        .insn   s,0xb2800000,\newpp
-       0:
-#endif
+0:
        .endm
 
 sie_irq_handler: