Skip to content

Commit 0ae241f

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/relocate_kernel: adjust indentation
relocate_kernel.S seems to be the only assembler file which doesn't follow the standard way of indentation. Adjust this for the sake of consistency. Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 680957b commit 0ae241f

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

arch/s390/kernel/relocate_kernel.S

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,50 +27,50 @@
2727

2828
.text
2929
SYM_CODE_START(relocate_kernel)
30-
basr %r13,0 # base address
31-
.base:
32-
lghi %r7,PAGE_SIZE # load PAGE_SIZE in r7
33-
lghi %r9,PAGE_SIZE # load PAGE_SIZE in r9
34-
lg %r5,0(%r2) # read another word for indirection page
35-
aghi %r2,8 # increment pointer
36-
tml %r5,0x1 # is it a destination page?
37-
je .indir_check # NO, goto "indir_check"
38-
lgr %r6,%r5 # r6 = r5
39-
nill %r6,0xf000 # mask it out and...
40-
j .base # ...next iteration
41-
.indir_check:
42-
tml %r5,0x2 # is it a indirection page?
43-
je .done_test # NO, goto "done_test"
44-
nill %r5,0xf000 # YES, mask out,
45-
lgr %r2,%r5 # move it into the right register,
46-
j .base # and read next...
47-
.done_test:
48-
tml %r5,0x4 # is it the done indicator?
49-
je .source_test # NO! Well, then it should be the source indicator...
50-
j .done # ok, lets finish it here...
51-
.source_test:
52-
tml %r5,0x8 # it should be a source indicator...
53-
je .base # NO, ignore it...
54-
lgr %r8,%r5 # r8 = r5
55-
nill %r8,0xf000 # masking
56-
0: mvcle %r6,%r8,0x0 # copy PAGE_SIZE bytes from r8 to r6 - pad with 0
57-
jo 0b
58-
j .base
59-
.done:
60-
lgr %r0,%r4 # subcode
61-
cghi %r3,0
62-
je .diag
63-
la %r4,load_psw-.base(%r13) # load psw-address into the register
64-
o %r3,4(%r4) # or load address into psw
65-
st %r3,4(%r4)
66-
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
67-
.diag:
68-
diag %r0,%r0,0x308
30+
basr %r13,0 # base address
31+
.base:
32+
lghi %r7,PAGE_SIZE # load PAGE_SIZE in r7
33+
lghi %r9,PAGE_SIZE # load PAGE_SIZE in r9
34+
lg %r5,0(%r2) # read another word for indirection page
35+
aghi %r2,8 # increment pointer
36+
tml %r5,0x1 # is it a destination page?
37+
je .indir_check # NO, goto "indir_check"
38+
lgr %r6,%r5 # r6 = r5
39+
nill %r6,0xf000 # mask it out and...
40+
j .base # ...next iteration
41+
.indir_check:
42+
tml %r5,0x2 # is it a indirection page?
43+
je .done_test # NO, goto "done_test"
44+
nill %r5,0xf000 # YES, mask out,
45+
lgr %r2,%r5 # move it into the right register,
46+
j .base # and read next...
47+
.done_test:
48+
tml %r5,0x4 # is it the done indicator?
49+
je .source_test # NO! Well, then it should be the source indicator...
50+
j .done # ok, lets finish it here...
51+
.source_test:
52+
tml %r5,0x8 # it should be a source indicator...
53+
je .base # NO, ignore it...
54+
lgr %r8,%r5 # r8 = r5
55+
nill %r8,0xf000 # masking
56+
0: mvcle %r6,%r8,0x0 # copy PAGE_SIZE bytes from r8 to r6 - pad with 0
57+
jo 0b
58+
j .base
59+
.done:
60+
lgr %r0,%r4 # subcode
61+
cghi %r3,0
62+
je .diag
63+
la %r4,load_psw-.base(%r13) # load psw-address into the register
64+
o %r3,4(%r4) # or load address into psw
65+
st %r3,4(%r4)
66+
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
67+
.diag:
68+
diag %r0,%r0,0x308
6969
SYM_CODE_END(relocate_kernel)
7070

71-
.balign 8
71+
.balign 8
7272
SYM_DATA_START_LOCAL(load_psw)
73-
.long 0x00080000,0x80000000
73+
.long 0x00080000,0x80000000
7474
SYM_DATA_END_LABEL(load_psw, SYM_L_LOCAL, relocate_kernel_end)
75-
.balign 8
75+
.balign 8
7676
SYM_DATA(relocate_kernel_len, .quad relocate_kernel_end - relocate_kernel)

0 commit comments

Comments
 (0)