GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-04 05:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Michael Holzheu 2009-10-06 10:34:12 +02:00 • committed by Martin Schwidefsky
parent 623c08e4cb
commit dd43bfca43
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/s390/kernel/swsusp_asm64.S
View file

@ -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:
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 */