diff options
| -rw-r--r-- | arch/s390/kernel/swsusp_asm64.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index 008e35af339f..7c8653e27db6 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
| @@ -43,7 +43,7 @@ swsusp_arch_suspend: | |||
| 43 | lghi %r1,0x1000 | 43 | lghi %r1,0x1000 |
| 44 | 44 | ||
| 45 | /* Save CPU address */ | 45 | /* Save CPU address */ |
| 46 | stap __LC_CPU_ADDRESS(%r1) | 46 | stap __LC_CPU_ADDRESS(%r0) |
| 47 | 47 | ||
| 48 | /* Store registers */ | 48 | /* Store registers */ |
| 49 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ | 49 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ |
| @@ -172,8 +172,7 @@ pgm_check_entry: | |||
| 172 | larl %r1,.Lresume_cpu /* Resume CPU address: r2 */ | 172 | larl %r1,.Lresume_cpu /* Resume CPU address: r2 */ |
| 173 | stap 0(%r1) | 173 | stap 0(%r1) |
| 174 | llgh %r2,0(%r1) | 174 | llgh %r2,0(%r1) |
| 175 | lghi %r3,0x1000 | 175 | llgh %r1,__LC_CPU_ADDRESS(%r0) /* Suspend CPU address: r1 */ |
| 176 | llgh %r1,__LC_CPU_ADDRESS(%r3) /* Suspend CPU address: r1 */ | ||
| 177 | cgr %r1,%r2 | 176 | cgr %r1,%r2 |
| 178 | je restore_registers /* r1 = r2 -> nothing to do */ | 177 | je restore_registers /* r1 = r2 -> nothing to do */ |
| 179 | larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ | 178 | larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ |