diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-11 17:28:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:17:06 -0700 |
| commit | 1e5c374d3833f816b4840227c6949f689af0cb44 (patch) | |
| tree | e935b95f49a5a23394b18b2b122b81f289e31586 /arch | |
| parent | b971018bae94bb43ae2402f884684ad69e85f931 (diff) | |
| download | op-kernel-dev-1e5c374d3833f816b4840227c6949f689af0cb44.zip op-kernel-dev-1e5c374d3833f816b4840227c6949f689af0cb44.tar.gz | |
[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')
| -rw-r--r-- | arch/m68k/kernel/process.c | 8 | ||||
| -rw-r--r-- | arch/m68k/kernel/traps.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 45a4664..24e83d5 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) { unsigned long clone_flags; unsigned long newsp; - int *parent_tidptr, *child_tidptr; + int __user *parent_tidptr, *child_tidptr; /* syscall2 puts clone_flags in d1 and usp in d2 */ clone_flags = regs->d1; newsp = regs->d2; - parent_tidptr = (int *)regs->d3; - child_tidptr = (int *)regs->d4; + parent_tidptr = (int __user *)regs->d3; + child_tidptr = (int __user *)regs->d4; if (!newsp) newsp = rdusp(); return do_fork(clone_flags, newsp, regs, 0, @@ -361,7 +361,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump) /* * sys_execve() executes a new program. */ -asmlinkage int sys_execve(char *name, char **argv, char **envp) +asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __user * __user *envp) { int error; char * filename; diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 4569406..759fa244 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -326,13 +326,13 @@ static inline int do_040writeback1(unsigned short wbs, unsigned long wba, switch (wbs & WBSIZ_040) { case BA_SIZE_BYTE: - res = put_user(wbd & 0xff, (char *)wba); + res = put_user(wbd & 0xff, (char __user *)wba); break; case BA_SIZE_WORD: - res = put_user(wbd & 0xffff, (short *)wba); + res = put_user(wbd & 0xffff, (short __user *)wba); break; case BA_SIZE_LONG: - res = put_user(wbd, (int *)wba); + res = put_user(wbd, (int __user *)wba); break; } |
