2 files changed, 15 insertions, 2 deletions

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 5d8f987a340d..a821b1cd4fa7 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -571,8 +571,6 @@ GLOBAL(\label)
 
         PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn
         PTREGSCALL stub32_sigreturn, sys32_sigreturn
-        PTREGSCALL stub32_execve, compat_sys_execve
-        PTREGSCALL stub32_execveat, compat_sys_execveat
         PTREGSCALL stub32_fork, sys_fork
         PTREGSCALL stub32_vfork, sys_vfork
 
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index f7d9ba6f73a3..5380b3a8f3e5 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -538,6 +538,21 @@ ENTRY(stub_x32_execveat)
 END(stub_x32_execveat)
 #endif
 
+#ifdef CONFIG_IA32_EMULATION
+ENTRY(stub32_execve)
+        CFI_STARTPROC
+        call    compat_sys_execve
+        jmp     return_from_execve
+        CFI_ENDPROC
+END(stub32_execve)
+ENTRY(stub32_execveat)
+        CFI_STARTPROC
+        call    compat_sys_execveat
+        jmp     return_from_execve
+        CFI_ENDPROC
+END(stub32_execveat)
+#endif
+
 /*
  * sigreturn is special because it needs to restore all registers on return.
  * This cannot be done with SYSRET, so use the IRET return path instead.