Commit dd43bfca authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky

[S390] hibernate: Use correct place for CPU address in lowcore

We used address 0x1084 instead of 0x84 to store the suspend CPU address.
With this patch we use the correct address 0x84 as it is defined in
the POP.
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 623c08e4
...@@ -43,7 +43,7 @@ swsusp_arch_suspend: ...@@ -43,7 +43,7 @@ swsusp_arch_suspend:
lghi %r1,0x1000 lghi %r1,0x1000
/* Save CPU address */ /* Save CPU address */
stap __LC_CPU_ADDRESS(%r1) stap __LC_CPU_ADDRESS(%r0)
/* Store registers */ /* Store registers */
mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */
...@@ -172,8 +172,7 @@ pgm_check_entry: ...@@ -172,8 +172,7 @@ pgm_check_entry:
larl %r1,.Lresume_cpu /* Resume CPU address: r2 */ larl %r1,.Lresume_cpu /* Resume CPU address: r2 */
stap 0(%r1) stap 0(%r1)
llgh %r2,0(%r1) llgh %r2,0(%r1)
lghi %r3,0x1000 llgh %r1,__LC_CPU_ADDRESS(%r0) /* Suspend CPU address: r1 */
llgh %r1,__LC_CPU_ADDRESS(%r3) /* Suspend CPU address: r1 */
cgr %r1,%r2 cgr %r1,%r2
je restore_registers /* r1 = r2 -> nothing to do */ je restore_registers /* r1 = r2 -> nothing to do */
larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment