From: David Howells <dhowells@redhat.com>
To: linux-arch@vger.kernel.org
Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: [PATCH 06/17] SH: Add missing consts to sys_execve() declaration
Date: Fri, 10 Sep 2010 17:24:38 +0100 [thread overview]
Message-ID: <20100910162438.20817.21625.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20100910162407.20817.34359.stgit@warthog.procyon.org.uk>
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,
next prev parent reply other threads:[~2010-09-10 16:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 16:24 [PATCH 00/17] Name the irq flag handling functions sanely David Howells
2010-09-10 16:24 ` [PATCH 01/17] Blackfin: Split PLL code from mach-specific cdef headers David Howells
2010-09-10 16:24 ` [PATCH 02/17] Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header David Howells
2010-09-10 16:24 ` [PATCH 03/17] Blackfin: Rename DES PC2() symbol to avoid collision David Howells
2010-09-10 16:24 ` [PATCH 04/17] Blackfin: Add missing dep to asm/irqflags.h David Howells
2010-09-10 16:24 ` [PATCH 05/17] Blackfin: Rename IRQ flags handling functions David Howells
2010-09-10 16:24 ` David Howells [this message]
2010-09-10 16:24 ` [PATCH 07/17] Drop a couple of unnecessary asm/system.h inclusions David Howells
2010-09-10 16:24 ` [PATCH 08/17] MIPS: TX49xx: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN David Howells
2010-09-10 16:24 ` [PATCH 09/17] smc91x: Add missing #inclusion of <linux/irq.h> David Howells
2010-09-10 16:24 ` [PATCH 10/17] MIPS: Add missing #inclusions " David Howells
2010-09-10 16:25 ` [PATCH 11/17] Fix IRQ flag handling naming David Howells
2010-09-10 16:25 ` [PATCH 12/17] Fix IA64 irqflags David Howells
2010-09-10 16:25 ` [PATCH 13/17] Fix CRIS irqflags David Howells
2010-09-10 16:25 ` [PATCH 14/17] Fix powerpc irqflags David Howells
2010-09-10 16:25 ` [PATCH 15/17] Fix SH irqflags David Howells
2010-09-10 16:25 ` [PATCH 16/17] Fix XTENSA irqflags David Howells
2010-09-10 16:25 ` [PATCH 17/17] Fix Score irqflags David Howells
-- strict thread matches above, loose matches on Subject: below --
2010-09-10 16:10 [PATCH 00/17] Name the irq flag handling functions sanely David Howells
2010-09-10 16:10 ` [PATCH 06/17] SH: Add missing consts to sys_execve() declaration David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100910162438.20817.21625.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®