1 files changed, 0 insertions, 39 deletions

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index d75b872ca4dc..9a260b317d8d 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -71,15 +71,6 @@ ENTRY(ia64_execve)
         add out3=16,sp                  // regs
         br.call.sptk.many rp=sys_execve
 .ret0:
-#ifdef CONFIG_IA32_SUPPORT
-        /*
-         * Check if we're returning to ia32 mode. If so, we need to restore ia32 registers
-         * from pt_regs.
-         */
-        adds r16=PT(CR_IPSR)+16,sp
-        ;;
-        ld8 r16=[r16]
-#endif
         cmp4.ge p6,p7=r8,r0
         mov ar.pfs=loc1                 // restore ar.pfs
         sxt4 r8=r8                      // return 64-bit result
@@ -108,12 +99,6 @@ ENTRY(ia64_execve)
         ldf.fill f23=[sp];      ldf.fill f24=[sp];      mov f25=f0
         ldf.fill f26=[sp];      ldf.fill f27=[sp];      mov f28=f0
         ldf.fill f29=[sp];      ldf.fill f30=[sp];      mov f31=f0
-#ifdef CONFIG_IA32_SUPPORT
-        tbit.nz p6,p0=r16, IA64_PSR_IS_BIT
-        movl loc0=ia64_ret_from_ia32_execve
-        ;;
-(p6)    mov rp=loc0
-#endif
         br.ret.sptk.many rp
 END(ia64_execve)
 
@@ -848,30 +833,6 @@ __paravirt_work_processed_syscall:
         br.cond.sptk.many rbs_switch    // B
 END(__paravirt_leave_syscall)
 
-#ifdef __IA64_ASM_PARAVIRTUALIZED_NATIVE
-#ifdef CONFIG_IA32_SUPPORT
-GLOBAL_ENTRY(ia64_ret_from_ia32_execve)
-        PT_REGS_UNWIND_INFO(0)
-        adds r2=PT(R8)+16,sp                    // r2 = &pt_regs.r8
-        adds r3=PT(R10)+16,sp                   // r3 = &pt_regs.r10
-        ;;
-        .mem.offset 0,0
-        st8.spill [r2]=r8       // store return value in slot for r8 and set unat bit
-        .mem.offset 8,0
-        st8.spill [r3]=r0       // clear error indication in slot for r10 and set unat bit
-#ifdef CONFIG_PARAVIRT
-        ;;
-        // don't fall through, ia64_leave_kernel may be #define'd
-        br.cond.sptk.few ia64_leave_kernel
-        ;;
-#endif /* CONFIG_PARAVIRT */
-END(ia64_ret_from_ia32_execve)
-#ifndef CONFIG_PARAVIRT
-        // fall through
-#endif
-#endif /* CONFIG_IA32_SUPPORT */
-#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
-
 GLOBAL_ENTRY(__paravirt_leave_kernel)
         PT_REGS_UNWIND_INFO(0)
         /*