* [PATCH] SH: Add missing consts to sys_execve() declaration
@ 2010-08-27 1:30 David Howells
2010-08-31 15:52 ` David Howells
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: David Howells @ 2010-08-27 1:30 UTC (permalink / raw)
To: linux-sh
Add missing consts to the sys_execve() declaration which result in the
following error:
arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve'
/warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here
Signed-off-by: David Howells <dhowells@redhat.com>
---
arch/sh/include/asm/syscalls_32.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index be201fd..454538a 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -19,8 +19,10 @@ 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(const char __user *ufilename, char __user * __user *uargv,
- char __user * __user *uenvp, unsigned long r7,
+asmlinkage int sys_execve(const char __user *ufilename,
+ const char __user *const __user *uargv,
+ const char __user *const __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,
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] SH: Add missing consts to sys_execve() declaration
2010-08-27 1:30 [PATCH] SH: Add missing consts to sys_execve() declaration David Howells
@ 2010-08-31 15:52 ` David Howells
2010-08-31 17:05 ` Jean-Christophe PLAGNIOL-VILLARD
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: David Howells @ 2010-08-31 15:52 UTC (permalink / raw)
To: linux-sh
Add missing consts to the sys_execve() declaration which result in the
following error:
arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve'
/warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here
Signed-off-by: David Howells <dhowells@redhat.com>
---
arch/sh/include/asm/syscalls_32.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index be201fd..454538a 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -19,8 +19,10 @@ 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(const char __user *ufilename, char __user * __user *uargv,
- char __user * __user *uenvp, unsigned long r7,
+asmlinkage int sys_execve(const char __user *ufilename,
+ const char __user *const __user *uargv,
+ const char __user *const __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,
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] SH: Add missing consts to sys_execve() declaration
2010-08-27 1:30 [PATCH] SH: Add missing consts to sys_execve() declaration David Howells
2010-08-31 15:52 ` David Howells
@ 2010-08-31 17:05 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-02 2:57 ` Paul Mundt
2010-09-02 9:50 ` David Howells
3 siblings, 0 replies; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2010-08-31 17:05 UTC (permalink / raw)
To: linux-sh
On 16:52 Tue 31 Aug , David Howells wrote:
> Add missing consts to the sys_execve() declaration which result in the
> following error:
>
> arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve'
> /warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here
I send it too just before :p
Best Regards,
J.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] SH: Add missing consts to sys_execve() declaration
2010-08-27 1:30 [PATCH] SH: Add missing consts to sys_execve() declaration David Howells
2010-08-31 15:52 ` David Howells
2010-08-31 17:05 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2010-09-02 2:57 ` Paul Mundt
2010-09-02 9:50 ` David Howells
3 siblings, 0 replies; 5+ messages in thread
From: Paul Mundt @ 2010-09-02 2:57 UTC (permalink / raw)
To: linux-sh
On Tue, Aug 31, 2010 at 07:05:48PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 16:52 Tue 31 Aug , David Howells wrote:
> > Add missing consts to the sys_execve() declaration which result in the
> > following error:
> >
> > arch/sh/kernel/process_32.c:303: error: conflicting types for 'sys_execve'
> > /warthog/nfs/linux-2.6-fscache/arch/sh/include/asm/syscalls_32.h:24: error: previous declaration of 'sys_execve' was here
> I send it too just before :p
>
And in both cases it has already been fixed in my tree for some time,
presumably Linus was unhappy with my -rc2 changes, so I'll have another
go at breakig things down for -rc4.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] SH: Add missing consts to sys_execve() declaration
2010-08-27 1:30 [PATCH] SH: Add missing consts to sys_execve() declaration David Howells
` (2 preceding siblings ...)
2010-09-02 2:57 ` Paul Mundt
@ 2010-09-02 9:50 ` David Howells
3 siblings, 0 replies; 5+ messages in thread
From: David Howells @ 2010-09-02 9:50 UTC (permalink / raw)
To: linux-sh
Paul Mundt <lethal@linux-sh.org> wrote:
> And in both cases it has already been fixed in my tree for some time,
> presumably Linus was unhappy with my -rc2 changes, so I'll have another
> go at breakig things down for -rc4.
Feel fry to add my Acked-by to it.
David
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-02 9:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-27 1:30 [PATCH] SH: Add missing consts to sys_execve() declaration David Howells
2010-08-31 15:52 ` David Howells
2010-08-31 17:05 ` Jean-Christophe PLAGNIOL-VILLARD
2010-09-02 2:57 ` Paul Mundt
2010-09-02 9:50 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).