diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /arch/x86/kernel/sys_i386_32.c | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) | |
| download | blackbird-op-linux-b9afa3e015273a52718e0a7efe198a0df76be880.tar.gz blackbird-op-linux-b9afa3e015273a52718e0a7efe198a0df76be880.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/x86/kernel/sys_i386_32.c')
| -rw-r--r-- | arch/x86/kernel/sys_i386_32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c index 196552bb412c..d5e06624e34a 100644 --- a/arch/x86/kernel/sys_i386_32.c +++ b/arch/x86/kernel/sys_i386_32.c @@ -28,7 +28,9 @@ * Do a system call from kernel instead of calling sys_execve so we * end up with proper pt_regs. */ -int kernel_execve(const char *filename, char *const argv[], char *const envp[]) +int kernel_execve(const char *filename, + const char *const argv[], + const char *const envp[]) { long __res; asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" |
