3 files changed, 2 insertions, 15 deletions

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 178d92536d90..e7192e1cb678 100644
--- 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 2f4b687cc7fa..a7251580891c 100644
--- 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 31646bd0e469..7e9d30d567b0 100644
--- 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: