Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39383
b: refs/heads/master
c: fd2c903
h: refs/heads/master
i:
  39381: 49c43f0
  39379: 2b67bb9
  39375: 51d6e69
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 11, 2006
1 parent 72deed1 commit af4a53b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 12ea59e8109d7192ecb2ac994588e24b11ab0428
refs/heads/master: fd2c903b89a6c3cec9388eb24a134ebc1be20747
6 changes: 3 additions & 3 deletions trunk/arch/m32r/kernel/sys_m32r.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/*
* sys_tas() - test-and-set
*/
asmlinkage int sys_tas(int *addr)
asmlinkage int sys_tas(int __user *addr)
{
int oldval;

Expand Down Expand Up @@ -90,7 +90,7 @@ sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2,

error = do_pipe(fd);
if (!error) {
if (copy_to_user((void *)r0, (void *)fd, 2*sizeof(int)))
if (copy_to_user((void __user *)r0, fd, 2*sizeof(int)))
error = -EFAULT;
}
return error;
Expand Down Expand Up @@ -201,7 +201,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
}
}

asmlinkage int sys_uname(struct old_utsname * name)
asmlinkage int sys_uname(struct old_utsname __user * name)
{
int err;
if (!name)
Expand Down

0 comments on commit af4a53b

Please sign in to comment.