1 files changed, 11 insertions, 8 deletions

diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index acb78cdee896..dd70ef046058 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -42,7 +42,7 @@ ENTRY(swsusp_arch_suspend)
         lghi    %r1,0x1000
 
         /* Save CPU address */
-        stap    __LC_CPU_ADDRESS(%r0)
+        stap    __LC_EXT_CPU_ADDR(%r0)
 
         /* Store registers */
         mvc     0x318(4,%r1),__SF_EMPTY(%r15)   /* move prefix to lowcore */
@@ -173,15 +173,15 @@ pgm_check_entry:
         larl    %r1,.Lresume_cpu                /* Resume CPU address: r2 */
         stap    0(%r1)
         llgh    %r2,0(%r1)
-        llgh    %r1,__LC_CPU_ADDRESS(%r0)       /* Suspend CPU address: r1 */
+        llgh    %r1,__LC_EXT_CPU_ADDR(%r0)      /* Suspend CPU address: r1 */
         cgr     %r1,%r2
         je      restore_registers               /* r1 = r2 -> nothing to do */
         larl    %r4,.Lrestart_suspend_psw       /* Set new restart PSW */
         mvc     __LC_RST_NEW_PSW(16,%r0),0(%r4)
 3:
-        sigp    %r9,%r1,__SIGP_INITIAL_CPU_RESET
-        brc     8,4f    /* accepted */
-        brc     2,3b    /* busy, try again */
+        sigp    %r9,%r1,11                      /* sigp initial cpu reset */
+        brc     8,4f                            /* accepted */
+        brc     2,3b                            /* busy, try again */
 
         /* Suspend CPU not available -> panic */
         larl    %r15,init_thread_union
@@ -196,10 +196,10 @@ pgm_check_entry:
         lpsw    0(%r3)
 4:
         /* Switch to suspend CPU */
-        sigp    %r9,%r1,__SIGP_RESTART  /* start suspend CPU */
+        sigp    %r9,%r1,6               /* sigp restart to suspend CPU */
         brc     2,4b                    /* busy, try again */
 5:
-        sigp    %r9,%r2,__SIGP_STOP     /* stop resume (current) CPU */
+        sigp    %r9,%r2,5               /* sigp stop to current resume CPU */
         brc     2,5b                    /* busy, try again */
 6:      j       6b
 
@@ -207,7 +207,7 @@ restart_suspend:
         larl    %r1,.Lresume_cpu
         llgh    %r2,0(%r1)
 7:
-        sigp    %r9,%r2,__SIGP_SENSE    /* Wait for resume CPU */
+        sigp    %r9,%r2,1               /* sigp sense, wait for resume CPU */
         brc     8,7b                    /* accepted, status 0, still running */
         brc     2,7b                    /* busy, try again */
         tmll    %r9,0x40                /* Test if resume CPU is stopped */
@@ -257,6 +257,9 @@ restore_registers:
         lghi    %r2,0
         brasl   %r14,arch_set_page_states
 
+        /* Log potential guest relocation */
+        brasl   %r14,lgr_info_log
+
         /* Reinitialize the channel subsystem */
         brasl   %r14,channel_subsystem_reinit