summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/kernel/sys_m68k.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-10 07:27:33 +0200
committerDavid S. Miller <davem@davemloft.net>2010-09-10 07:27:33 +0200
commite548833df83c3554229eff0672900bfe958b45fd (patch)
tree85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/m68knommu/kernel/sys_m68k.c
parentdrivers/net/bnx2x: use ARRAY_SIZE macro in bnx2x_main.c (diff)
parentMerge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst... (diff)
downloadlinux-e548833df83c3554229eff0672900bfe958b45fd.tar.xz
linux-e548833df83c3554229eff0672900bfe958b45fd.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/main.c
Diffstat (limited to 'arch/m68knommu/kernel/sys_m68k.c')
-rw-r--r--arch/m68knommu/kernel/sys_m68k.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index d65e9c4c930c..68488ae47f0a 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -44,7 +44,9 @@ asmlinkage int sys_getpagesize(void)
* 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[])
{
register long __res asm ("%d0") = __NR_execve;
register long __a asm ("%d1") = (long)(filename);