2 files changed, 1 insertions, 6 deletions

diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index 96047491d1b9..ee3ff76c8a35 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -1025,18 +1025,13 @@ ia64_old_stack:
 
 ia64_set_kernel_registers:
         add temp3=MCA_SP_OFFSET, r3
-        add temp4=MCA_SOS_OFFSET+SOS(OS_GP), r3
         mov b0=r2               // save return address
         GET_IA64_MCA_DATA(temp1)
         ;;
-        add temp4=temp4, temp1  // &struct ia64_sal_os_state.os_gp
         add r12=temp1, temp3    // kernel stack pointer on MCA/INIT stack
         add r13=temp1, r3       // set current to start of MCA/INIT stack
         add r20=temp1, r3       // physical start of MCA/INIT stack
         ;;
-        ld8 r1=[temp4]          // OS GP from SAL OS state
-        ;;
-        DATA_PA_TO_VA(r1,temp1)
         DATA_PA_TO_VA(r12,temp2)
         DATA_PA_TO_VA(r13,temp3)
         ;;
diff --git a/include/asm-ia64/mca_asm.h b/include/asm-ia64/mca_asm.h
index 27c9203d8ce3..76203f9a8718 100644
--- a/include/asm-ia64/mca_asm.h
+++ b/include/asm-ia64/mca_asm.h
@@ -197,9 +197,9 @@
         movl    temp2 = start_addr;                             \
         ;;                                                      \
         mov     cr.iip = temp2;                                 \
+        movl    gp = __gp                                       \
         ;;                                                      \
         DATA_PA_TO_VA(sp, temp1);                               \
-        DATA_PA_TO_VA(gp, temp2);                               \
         srlz.i;                                                 \
         ;;                                                      \
         nop     1;                                              \