projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
s390
/
kernel
/
relocate_kernel.S
diff --git
a/arch/s390/kernel/relocate_kernel.S
b/arch/s390/kernel/relocate_kernel.S
index
f9899ff
..
3b456b8
100644
(file)
--- a/
arch/s390/kernel/relocate_kernel.S
+++ b/
arch/s390/kernel/relocate_kernel.S
@@
-26,8
+26,7
@@
relocate_kernel:
basr %r13,0 # base address
.base:
relocate_kernel:
basr %r13,0 # base address
.base:
- stnsm sys_msk-.base(%r13),0xf8 # disable DAT and IRQ (external)
- spx zero64-.base(%r13) # absolute addressing mode
+ stnsm sys_msk-.base(%r13),0xfb # disable DAT
stctl %c0,%c15,ctlregs-.base(%r13)
stm %r0,%r15,gprregs-.base(%r13)
la %r1,load_psw-.base(%r13)
stctl %c0,%c15,ctlregs-.base(%r13)
stm %r0,%r15,gprregs-.base(%r13)
la %r1,load_psw-.base(%r13)
@@
-97,8
+96,6
@@
lpsw 0 # hopefully start new kernel...
.align 8
lpsw 0 # hopefully start new kernel...
.align 8
- zero64:
- .quad 0
load_psw:
.long 0x00080000,0x80000000
sys_msk:
load_psw:
.long 0x00080000,0x80000000
sys_msk: