hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] misc m68k __user annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-10-11 17:28:07 +01:00 committed by Linus Torvalds
parent b971018bae
commit 1e5c374d38
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/m68k/kernel/process.c
View File

@ -221,13 +221,13 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
{ {
unsigned long clone_flags; unsigned long clone_flags;
unsigned long newsp; unsigned long newsp;
int *parent_tidptr, *child_tidptr; int __user *parent_tidptr, *child_tidptr;
/* syscall2 puts clone_flags in d1 and usp in d2 */ /* syscall2 puts clone_flags in d1 and usp in d2 */
clone_flags = regs->d1; clone_flags = regs->d1;
newsp = regs->d2; newsp = regs->d2;
parent_tidptr = (int *)regs->d3; parent_tidptr = (int __user *)regs->d3;
child_tidptr = (int *)regs->d4; child_tidptr = (int __user *)regs->d4;
if (!newsp) if (!newsp)
newsp = rdusp(); newsp = rdusp();
return do_fork(clone_flags, newsp, regs, 0, 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. * 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; int error;
char * filename; char * filename;

6
arch/m68k/kernel/traps.c
View File

@ -326,13 +326,13 @@ static inline int do_040writeback1(unsigned short wbs, unsigned long wba,
switch (wbs & WBSIZ_040) { switch (wbs & WBSIZ_040) {
case BA_SIZE_BYTE: case BA_SIZE_BYTE:
res = put_user(wbd & 0xff, (char *)wba); res = put_user(wbd & 0xff, (char __user *)wba);
break; break;
case BA_SIZE_WORD: case BA_SIZE_WORD:
res = put_user(wbd & 0xffff, (short *)wba); res = put_user(wbd & 0xffff, (short __user *)wba);
break; break;
case BA_SIZE_LONG: case BA_SIZE_LONG:
res = put_user(wbd, (int *)wba); res = put_user(wbd, (int __user *)wba);
break; break;
} }