summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.vnet.ibm.com>2017-10-27 12:44:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2017-11-02 12:32:46 +0100
commit2a2d7befd40c95fd0d27d14edd0ec3b479fcf21f (patch)
tree82e516106ebc44705b0bd9833957d54b08ed45a7 /arch/s390
parent3b42c17a7e264ce4b351d2de205d4c39f725af0f (diff)
downloadblackbird-op-linux-2a2d7befd40c95fd0d27d14edd0ec3b479fcf21f.tar.gz
blackbird-op-linux-2a2d7befd40c95fd0d27d14edd0ec3b479fcf21f.zip
s390/nmi: avoid using long-displacement facility
__LC_MCESAD is currently 4528 /* offsetof(struct lowcore, mcesad) */ that would require long-displacement facility for lg, which we don't have on z900. Fixes: 3037a52f9846 ("s390/nmi: do register validation as early as possible") Signed-off-by: Vasily Gorbik <gor@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 9887d3ed6eb1..8a0b54e7e946 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -964,7 +964,7 @@ ENTRY(mcck_int_handler)
la %r14,4095
lctlg %c0,%c15,__LC_CREGS_SAVE_AREA-4095(%r14) # validate ctl regs
ptlb
- lg %r11,__LC_MCESAD # extended machine check save area
+ lg %r11,__LC_MCESAD-4095(%r14) # extended machine check save area
nill %r11,0xfc00 # MCESA_ORIGIN_MASK
TSTMSK __LC_CREGS_SAVE_AREA+16-4095(%r14),CR2_GUARDED_STORAGE
jno 0f
OpenPOWER on IntegriCloud