diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 444fd72e0787ee727fa74b97d06059b6ddce4992..02b660a7dcd4317c84dbfac161ad197f973d21c2 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -88,9 +88,7 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
 	clg	\scratch,BASED(.Lsie_length)
 	jhe	.+22
 	lg	%r9,BASED(.Lsie_loop)
-	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_SPP
-	jz	.+8
-	.insn	s,0xb2800000,BASED(.Lhost_id)	# set host id
+	SPP	BASED(.Lhost_id)	# set host id
 #endif
 	.endm