diff options
| -rw-r--r-- | arch/s390/kernel/smp.c | 1 | ||||
| -rw-r--r-- | arch/s390/kernel/swsusp_asm64.S | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index c99c45b848e3..93e52039321b 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -76,7 +76,6 @@ static int cpu_stopped(int cpu) | |||
| 76 | __u32 status; | 76 | __u32 status; |
| 77 | 77 | ||
| 78 | switch (signal_processor_ps(&status, 0, cpu, sigp_sense)) { | 78 | switch (signal_processor_ps(&status, 0, cpu, sigp_sense)) { |
| 79 | case sigp_order_code_accepted: | ||
| 80 | case sigp_status_stored: | 79 | case sigp_status_stored: |
| 81 | /* Check for stopped and check stop state */ | 80 | /* Check for stopped and check stop state */ |
| 82 | if (status & 0x50) | 81 | if (status & 0x50) |
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index 0f4ef3b856d9..0c26cc1898ec 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
| @@ -207,6 +207,7 @@ restart_suspend: | |||
| 207 | llgh %r2,0(%r1) | 207 | llgh %r2,0(%r1) |
| 208 | 7: | 208 | 7: |
| 209 | sigp %r9,%r2,__SIGP_SENSE /* Wait for resume CPU */ | 209 | sigp %r9,%r2,__SIGP_SENSE /* Wait for resume CPU */ |
| 210 | brc 8,7b /* accepted, status 0, still running */ | ||
| 210 | brc 2,7b /* busy, try again */ | 211 | brc 2,7b /* busy, try again */ |
| 211 | tmll %r9,0x40 /* Test if resume CPU is stopped */ | 212 | tmll %r9,0x40 /* Test if resume CPU is stopped */ |
| 212 | jz 7b | 213 | jz 7b |