X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fs390%2Fkernel%2Fhead.S;h=ea88d066bf04138a19bfa31fb7351b8737b2e81d;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=adad8863ee2f80f6336add25553ac5166695f48a;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index adad8863e..ea88d066b 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -1,7 +1,7 @@
 /*
  *  arch/s390/kernel/head.S
  *
- * Copyright (C) IBM Corp. 1999,2006
+ * (C) Copyright IBM Corp. 1999, 2005
  *
  *    Author(s): Hartmut Penner <hp@de.ibm.com>
  *		 Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -23,6 +23,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
 #include <asm/asm-offsets.h>
@@ -481,23 +482,24 @@ start:
 
 .macro GET_IPL_DEVICE
 .Lget_ipl_device:
-	l     %r1,0xb8			# get sid
+	basr  %r12,0
+.LGID:	l     %r1,0xb8			# get sid
 	sll   %r1,15			# test if subchannel is enabled
 	srl   %r1,31
 	ltr   %r1,%r1
-	bz    2f-.LPG1(%r13)		# subchannel disabled
+	bz    0(%r14)			# subchannel disabled
 	l     %r1,0xb8
-	la    %r5,.Lipl_schib-.LPG1(%r13)
+	la    %r5,.Lipl_schib-.LGID(%r12)
 	stsch 0(%r5)		        # get schib of subchannel
-	bnz   2f-.LPG1(%r13)		# schib not available
+	bnz   0(%r14)			# schib not available
 	tm    5(%r5),0x01		# devno valid?
-	bno   2f-.LPG1(%r13)
-	la    %r6,ipl_parameter_flags-.LPG1(%r13)
+	bno   0(%r14)
+	la    %r6,ipl_parameter_flags-.LGID(%r12)
 	oi    3(%r6),0x01		# set flag
-	la    %r2,ipl_devno-.LPG1(%r13)
+	la    %r2,ipl_devno-.LGID(%r12)
 	mvc   0(2,%r2),6(%r5)		# store devno
 	tm    4(%r5),0x80		# qdio capable device?
-	bno   2f-.LPG1(%r13)
+	bno   0(%r14)
 	oi    3(%r6),0x02		# set flag
 
 	# copy ipl parameters
@@ -521,7 +523,7 @@ start:
 	ar    %r2,%r1
 	sr    %r0,%r4
 	jne   1b
-	b     2f-.LPG1(%r13)
+	b     0(%r14)
 
 	.align 4
 .Lipl_schib:
@@ -535,7 +537,6 @@ ipl_parameter_flags:
 	.globl ipl_devno
 ipl_devno:
 	.word 0
-2:
 .endm
 
 #ifdef CONFIG_64BIT