aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/process.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-11 12:28:07 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 14:17:06 -0400
commit1e5c374d3833f816b4840227c6949f689af0cb44 (patch)
treee935b95f49a5a23394b18b2b122b81f289e31586 /arch/m68k/kernel/process.c
parentb971018bae94bb43ae2402f884684ad69e85f931 (diff)
[PATCH] misc m68k __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel/process.c')
-rw-r--r--arch/m68k/kernel/process.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 45a46646c1b3..24e83d54dcee 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -221,13 +221,13 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
221{ 221{
222 unsigned long clone_flags; 222 unsigned long clone_flags;
223 unsigned long newsp; 223 unsigned long newsp;
224 int *parent_tidptr, *child_tidptr; 224 int __user *parent_tidptr, *child_tidptr;
225 225
226 /* syscall2 puts clone_flags in d1 and usp in d2 */ 226 /* syscall2 puts clone_flags in d1 and usp in d2 */
227 clone_flags = regs->d1; 227 clone_flags = regs->d1;
228 newsp = regs->d2; 228 newsp = regs->d2;
229 parent_tidptr = (int *)regs->d3; 229 parent_tidptr = (int __user *)regs->d3;
230 child_tidptr = (int *)regs->d4; 230 child_tidptr = (int __user *)regs->d4;
231 if (!newsp) 231 if (!newsp)
232 newsp = rdusp(); 232 newsp = rdusp();
233 return do_fork(clone_flags, newsp, regs, 0, 233 return do_fork(clone_flags, newsp, regs, 0,
@@ -361,7 +361,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
361/* 361/*
362 * sys_execve() executes a new program. 362 * sys_execve() executes a new program.
363 */ 363 */
364asmlinkage int sys_execve(char *name, char **argv, char **envp) 364asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp)
365{ 365{
366 int error; 366 int error;
367 char * filename; 367 char * filename;