summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_32.S
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-12-10 01:01:53 +0100
committerH. Peter Anvin <hpa@zytor.com>2009-12-10 01:28:34 +0100
commit11cf88bd0b8165b65aaabaee0977e9a3ad474ab7 (patch)
tree33e74a88baf24ee971282ded562b78db40749bb9 /arch/x86/kernel/entry_32.S
parentx86: Merge sys_iopl (diff)
downloadlinux-11cf88bd0b8165b65aaabaee0977e9a3ad474ab7.tar.xz
linux-11cf88bd0b8165b65aaabaee0977e9a3ad474ab7.zip
x86: Merge sys_execve
Change 32-bit sys_execve to PTREGSCALL3, and merge with 64-bit. Signed-off-by: Brian Gerst <brgerst@gmail.com> LKML-Reference: <1260403316-5679-4-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r--arch/x86/kernel/entry_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index ab7fcef37453..a96a0d8a0fdb 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -762,7 +762,7 @@ PTREGSCALL1(iopl)
PTREGSCALL0(fork)
PTREGSCALL0(clone)
PTREGSCALL0(vfork)
-PTREGSCALL0(execve)
+PTREGSCALL3(execve)
PTREGSCALL0(sigaltstack)
PTREGSCALL0(sigreturn)
PTREGSCALL0(rt_sigreturn)