1 files changed, 36 insertions, 39 deletions
diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S
index 4562cdbce8eb..0340477f3b08 100644
--- a/arch/s390/kernel/reipl.S
+++ b/arch/s390/kernel/reipl.S
@@ -32,58 +32,58 @@ do_reipl_asm:	basr	%r13,0
                st      %r13, __LC_PSW_SAVE_AREA+4
                lctl    %c6,%c6,.Lall-.Lpg0(%r13)
-                lr      %r1,%r2
+                lr      %r1,%r2
-                mvc     __LC_PGM_NEW_PSW(8),.Lpcnew-.Lpg0(%r13)
+                mvc     __LC_PGM_NEW_PSW(8),.Lpcnew-.Lpg0(%r13)
-                stsch   .Lschib-.Lpg0(%r13)                                    
+                stsch   .Lschib-.Lpg0(%r13)
-                oi      .Lschib+5-.Lpg0(%r13),0x84 
+                oi      .Lschib+5-.Lpg0(%r13),0x84
-.Lecs:          xi      .Lschib+27-.Lpg0(%r13),0x01 
+.Lecs:          xi      .Lschib+27-.Lpg0(%r13),0x01
-                msch    .Lschib-.Lpg0(%r13) 
+                msch    .Lschib-.Lpg0(%r13)
-                lhi     %r0,5
+                lhi     %r0,5
-.Lssch:         ssch    .Liplorb-.Lpg0(%r13)           
+.Lssch:         ssch    .Liplorb-.Lpg0(%r13)
                jz      .L001
-                brct    %r0,.Lssch  
+                brct    %r0,.Lssch
                bas     %r14,.Ldisab-.Lpg0(%r13)
-.L001:          mvc     __LC_IO_NEW_PSW(8),.Lionew-.Lpg0(%r13)  
+.L001:          mvc     __LC_IO_NEW_PSW(8),.Lionew-.Lpg0(%r13)
-.Ltpi:          lpsw    .Lwaitpsw-.Lpg0(%r13)          
+.Ltpi:          lpsw    .Lwaitpsw-.Lpg0(%r13)
 .Lcont:         c       %r1,__LC_SUBCHANNEL_ID
                jnz     .Ltpi
                clc     __LC_IO_INT_PARM(4),.Liplorb-.Lpg0(%r13)
                jnz     .Ltpi
-                tsch    .Liplirb-.Lpg0(%r13)           
+                tsch    .Liplirb-.Lpg0(%r13)
                tm      .Liplirb+9-.Lpg0(%r13),0xbf
-                jz      .L002
+                jz      .L002
-                bas     %r14,.Ldisab-.Lpg0(%r13)    
+                bas     %r14,.Ldisab-.Lpg0(%r13)
-.L002:          tm      .Liplirb+8-.Lpg0(%r13),0xf3    
+.L002:          tm      .Liplirb+8-.Lpg0(%r13),0xf3
-                jz      .L003
+                jz      .L003
-                bas     %r14,.Ldisab-.Lpg0(%r13)        
+                bas     %r14,.Ldisab-.Lpg0(%r13)
 .L003:          spx     .Lnull-.Lpg0(%r13)
-                st      %r1,__LC_SUBCHANNEL_ID
+                st      %r1,__LC_SUBCHANNEL_ID
-                lpsw    0
+                lpsw    0
-                sigp    0,0,0(6)               
+                sigp    0,0,0(6)
-.Ldisab:        st      %r14,.Ldispsw+4-.Lpg0(%r13)
+.Ldisab:        st      %r14,.Ldispsw+4-.Lpg0(%r13)
                lpsw    .Ldispsw-.Lpg0(%r13)
-                .align  8
+                .align  8
 .Lclkcmp:       .quad   0x0000000000000000
 .Lall:          .long   0xff000000
-.Lnull:         .long   0x00000000
+.Lnull:         .long   0x00000000
 .Lctlsave1:     .long   0x00000000
 .Lctlsave2:     .long   0x00000000
-                .align  8
+                .align  8
-.Lnewpsw:       .long   0x00080000,0x80000000+.Lpg1
+.Lnewpsw:       .long   0x00080000,0x80000000+.Lpg1
-.Lpcnew:        .long   0x00080000,0x80000000+.Lecs
+.Lpcnew:        .long   0x00080000,0x80000000+.Lecs
-.Lionew:        .long   0x00080000,0x80000000+.Lcont
+.Lionew:        .long   0x00080000,0x80000000+.Lcont
 .Lwaitpsw:      .long   0x020a0000,0x00000000+.Ltpi
-.Ldispsw:       .long   0x000a0000,0x00000000
+.Ldispsw:       .long   0x000a0000,0x00000000
-.Liplccws:      .long   0x02000000,0x60000018
+.Liplccws:      .long   0x02000000,0x60000018
-                .long   0x08000008,0x20000001
+                .long   0x08000008,0x20000001
 .Liplorb:       .long   0x0049504c,0x0040ff80
                .long   0x00000000+.Liplccws
-.Lschib:        .long   0x00000000,0x00000000
+.Lschib:        .long   0x00000000,0x00000000
-                .long   0x00000000,0x00000000
+                .long   0x00000000,0x00000000
-                .long   0x00000000,0x00000000
+                .long   0x00000000,0x00000000
-                .long   0x00000000,0x00000000
+                .long   0x00000000,0x00000000
-                .long   0x00000000,0x00000000
+                .long   0x00000000,0x00000000
-                .long   0x00000000,0x00000000
+                .long   0x00000000,0x00000000
 .Liplirb:       .long   0x00000000,0x00000000
                .long   0x00000000,0x00000000
                .long   0x00000000,0x00000000
@@ -92,6 +92,3 @@ do_reipl_asm:	basr	%r13,0
                .long   0x00000000,0x00000000
                .long   0x00000000,0x00000000
                .long   0x00000000,0x00000000
-        
-

diff --git a/arch/s390/kernel/reipl.S b/arch/s390/kernel/reipl.S index 4562cdbce8eb..0340477f3b08 100644 --- a/arch/s390/kernel/reipl.S +++ b/arch/s390/kernel/reipl.S
@@ -32,58 +32,58 @@ do_reipl_asm: basr %r13,0
32	st %r13, __LC_PSW_SAVE_AREA+4	32	st %r13, __LC_PSW_SAVE_AREA+4
33		33
34	lctl %c6,%c6,.Lall-.Lpg0(%r13)	34	lctl %c6,%c6,.Lall-.Lpg0(%r13)
35	lr %r1,%r2	35	lr %r1,%r2
36	mvc __LC_PGM_NEW_PSW(8),.Lpcnew-.Lpg0(%r13)	36	mvc __LC_PGM_NEW_PSW(8),.Lpcnew-.Lpg0(%r13)
37	stsch .Lschib-.Lpg0(%r13)	37	stsch .Lschib-.Lpg0(%r13)
38	oi .Lschib+5-.Lpg0(%r13),0x84	38	oi .Lschib+5-.Lpg0(%r13),0x84
39	.Lecs: xi .Lschib+27-.Lpg0(%r13),0x01	39	.Lecs: xi .Lschib+27-.Lpg0(%r13),0x01
40	msch .Lschib-.Lpg0(%r13)	40	msch .Lschib-.Lpg0(%r13)
41	lhi %r0,5	41	lhi %r0,5
42	.Lssch: ssch .Liplorb-.Lpg0(%r13)	42	.Lssch: ssch .Liplorb-.Lpg0(%r13)
43	jz .L001	43	jz .L001
44	brct %r0,.Lssch	44	brct %r0,.Lssch
45	bas %r14,.Ldisab-.Lpg0(%r13)	45	bas %r14,.Ldisab-.Lpg0(%r13)
46	.L001: mvc __LC_IO_NEW_PSW(8),.Lionew-.Lpg0(%r13)	46	.L001: mvc __LC_IO_NEW_PSW(8),.Lionew-.Lpg0(%r13)
47	.Ltpi: lpsw .Lwaitpsw-.Lpg0(%r13)	47	.Ltpi: lpsw .Lwaitpsw-.Lpg0(%r13)
48	.Lcont: c %r1,__LC_SUBCHANNEL_ID	48	.Lcont: c %r1,__LC_SUBCHANNEL_ID
49	jnz .Ltpi	49	jnz .Ltpi
50	clc __LC_IO_INT_PARM(4),.Liplorb-.Lpg0(%r13)	50	clc __LC_IO_INT_PARM(4),.Liplorb-.Lpg0(%r13)
51	jnz .Ltpi	51	jnz .Ltpi
52	tsch .Liplirb-.Lpg0(%r13)	52	tsch .Liplirb-.Lpg0(%r13)
53	tm .Liplirb+9-.Lpg0(%r13),0xbf	53	tm .Liplirb+9-.Lpg0(%r13),0xbf
54	jz .L002	54	jz .L002
55	bas %r14,.Ldisab-.Lpg0(%r13)	55	bas %r14,.Ldisab-.Lpg0(%r13)
56	.L002: tm .Liplirb+8-.Lpg0(%r13),0xf3	56	.L002: tm .Liplirb+8-.Lpg0(%r13),0xf3
57	jz .L003	57	jz .L003
58	bas %r14,.Ldisab-.Lpg0(%r13)	58	bas %r14,.Ldisab-.Lpg0(%r13)
59	.L003: spx .Lnull-.Lpg0(%r13)	59	.L003: spx .Lnull-.Lpg0(%r13)
60	st %r1,__LC_SUBCHANNEL_ID	60	st %r1,__LC_SUBCHANNEL_ID
61	lpsw 0	61	lpsw 0
62	sigp 0,0,0(6)	62	sigp 0,0,0(6)
63	.Ldisab: st %r14,.Ldispsw+4-.Lpg0(%r13)	63	.Ldisab: st %r14,.Ldispsw+4-.Lpg0(%r13)
64	lpsw .Ldispsw-.Lpg0(%r13)	64	lpsw .Ldispsw-.Lpg0(%r13)
65	.align 8	65	.align 8
66	.Lclkcmp: .quad 0x0000000000000000	66	.Lclkcmp: .quad 0x0000000000000000
67	.Lall: .long 0xff000000	67	.Lall: .long 0xff000000
68	.Lnull: .long 0x00000000	68	.Lnull: .long 0x00000000
69	.Lctlsave1: .long 0x00000000	69	.Lctlsave1: .long 0x00000000
70	.Lctlsave2: .long 0x00000000	70	.Lctlsave2: .long 0x00000000
71	.align 8	71	.align 8
72	.Lnewpsw: .long 0x00080000,0x80000000+.Lpg1	72	.Lnewpsw: .long 0x00080000,0x80000000+.Lpg1
73	.Lpcnew: .long 0x00080000,0x80000000+.Lecs	73	.Lpcnew: .long 0x00080000,0x80000000+.Lecs
74	.Lionew: .long 0x00080000,0x80000000+.Lcont	74	.Lionew: .long 0x00080000,0x80000000+.Lcont
75	.Lwaitpsw: .long 0x020a0000,0x00000000+.Ltpi	75	.Lwaitpsw: .long 0x020a0000,0x00000000+.Ltpi
76	.Ldispsw: .long 0x000a0000,0x00000000	76	.Ldispsw: .long 0x000a0000,0x00000000
77	.Liplccws: .long 0x02000000,0x60000018	77	.Liplccws: .long 0x02000000,0x60000018
78	.long 0x08000008,0x20000001	78	.long 0x08000008,0x20000001
79	.Liplorb: .long 0x0049504c,0x0040ff80	79	.Liplorb: .long 0x0049504c,0x0040ff80
80	.long 0x00000000+.Liplccws	80	.long 0x00000000+.Liplccws
81	.Lschib: .long 0x00000000,0x00000000	81	.Lschib: .long 0x00000000,0x00000000
82	.long 0x00000000,0x00000000	82	.long 0x00000000,0x00000000
83	.long 0x00000000,0x00000000	83	.long 0x00000000,0x00000000
84	.long 0x00000000,0x00000000	84	.long 0x00000000,0x00000000
85	.long 0x00000000,0x00000000	85	.long 0x00000000,0x00000000
86	.long 0x00000000,0x00000000	86	.long 0x00000000,0x00000000
87	.Liplirb: .long 0x00000000,0x00000000	87	.Liplirb: .long 0x00000000,0x00000000
88	.long 0x00000000,0x00000000	88	.long 0x00000000,0x00000000
89	.long 0x00000000,0x00000000	89	.long 0x00000000,0x00000000
@@ -92,6 +92,3 @@ do_reipl_asm: basr %r13,0
92	.long 0x00000000,0x00000000	92	.long 0x00000000,0x00000000
93	.long 0x00000000,0x00000000	93	.long 0x00000000,0x00000000
94	.long 0x00000000,0x00000000	94	.long 0x00000000,0x00000000
95
96
97