diff options
| author | Phil Edworthy <PHIL.EDWORTHY@renesas.com> | 2011-04-14 16:11:35 +0100 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:16 -0700 |
| commit | 9128ce02d90d51012f561526d8c052f85a0d725b (patch) | |
| tree | 5e37a2dc4a89654b88b428d21340a53b20f66d9a | |
| parent | a6cba0b73761e2d3b94b0cceb15ee1f5f52d2b85 (diff) | |
| download | lwn-9128ce02d90d51012f561526d8c052f85a0d725b.tar.gz lwn-9128ce02d90d51012f561526d8c052f85a0d725b.zip | |
2.6.35.y: Revert "SH: Add missing consts to sys_execve() declaration"v2.6.35.13
This reverts commit 1219932ca26da2026e598590a3b7a2f36b3c3621
(commit d8b5fc01683c66060edc202d6bb5635365822181 upstream).
The reverted commit depends on an upstream commit that has not
been applied to 2.6.35.y (d7627467b7a8dd6944885290a03a07ceb28c10eb).
This fixes a build failure on all SH devices:
/arch/sh/kernel/process_32.c:299: error: conflicting types for 'sys_execve'
/arch/sh/include/asm/syscalls_32.h:22: note: previous declaration of 'sys_execve' was here
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index 611e92d90475..8b30200305c3 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -19,8 +19,8 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_execve(char __user *ufilename, const char __user * __user *uargv, - const char __user * __user *uenvp, unsigned long r7, +asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, + char __user * __user *uenvp, unsigned long r7, struct pt_regs __regs); asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, unsigned long r6, unsigned long r7, |