Commit 25e8318c authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds

[PATCH] m32r: fix sys_clone()

This patch is required to fix sys_clone() for m32r.

 * arch/m32r/kernel/process.c:
	- Fix sys_clone; add arguments, parent_tidptr and child_tidptr.
	- Cosmetics: Change indentation of function parameters for
	  sys_clone(), sys_vfork().
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 13e582f1
/* /*
* linux/arch/m32r/kernel/process.c * linux/arch/m32r/kernel/process.c
* orig : sh
* *
* Copyright (c) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata, * Copyright (c) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata,
* Hitoshi Yamamoto * Hitoshi Yamamoto
...@@ -290,13 +289,16 @@ asmlinkage int sys_fork(unsigned long r0, unsigned long r1, unsigned long r2, ...@@ -290,13 +289,16 @@ asmlinkage int sys_fork(unsigned long r0, unsigned long r1, unsigned long r2,
} }
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
unsigned long r2, unsigned long r3, unsigned long r4, unsigned long r5, unsigned long parent_tidptr,
unsigned long r6, struct pt_regs regs) unsigned long child_tidptr,
unsigned long r4, unsigned long r5, unsigned long r6,
struct pt_regs regs)
{ {
if (!newsp) if (!newsp)
newsp = regs.spu; newsp = regs.spu;
return do_fork(clone_flags, newsp, &regs, 0, NULL, NULL); return do_fork(clone_flags, newsp, &regs, 0,
(int __user *)parent_tidptr, (int __user *)child_tidptr);
} }
/* /*
...@@ -320,9 +322,10 @@ asmlinkage int sys_vfork(unsigned long r0, unsigned long r1, unsigned long r2, ...@@ -320,9 +322,10 @@ asmlinkage int sys_vfork(unsigned long r0, unsigned long r1, unsigned long r2,
/* /*
* sys_execve() executes a new program. * sys_execve() executes a new program.
*/ */
asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, char __user * __user *uenvp, asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv,
unsigned long r3, unsigned long r4, unsigned long r5, unsigned long r6, char __user * __user *uenvp,
struct pt_regs regs) unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, struct pt_regs regs)
{ {
int error; int error;
char *filename; char *filename;
...@@ -354,4 +357,3 @@ unsigned long get_wchan(struct task_struct *p) ...@@ -354,4 +357,3 @@ unsigned long get_wchan(struct task_struct *p)
/* M32R_FIXME */ /* M32R_FIXME */
return (0); return (0);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment