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/m32r/kernel/process.c | |
parent | Merge branch 'sh/pci-express-integration' (diff) | |
parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
download | linux-dev-b9afa3e015273a52718e0a7efe198a0df76be880.tar.xz linux-dev-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/m32r/kernel/process.c')
-rw-r--r-- | arch/m32r/kernel/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 8665a4d868ec..422bea9f1dbc 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c @@ -289,8 +289,8 @@ asmlinkage int sys_vfork(unsigned long r0, unsigned long r1, unsigned long r2, * sys_execve() executes a new program. */ asmlinkage int sys_execve(const char __user *ufilename, - char __user * __user *uargv, - char __user * __user *uenvp, + const char __user *const __user *uargv, + const char __user *const __user *uenvp, unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r6, struct pt_regs regs) { |