commit 9ee39e4b840d54f0127cd4ef607da79469917888
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon May 14 10:09:43 2012 +0200
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Wed May 16 14:42:43 2012 +0200
tree 9713da104c4e46e5aed13a2a440ef38ca0c48571
parent d49f47f83d15f3142d482a29de76f45360e34082

s390/entry64: avoid SPP code duplication

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

arch/s390/kernel/entry64.S

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 444fd72..02b660a 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -88,9 +88,7 @@
 	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