Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9419
b: refs/heads/master
c: ea8a918
h: refs/heads/master
i:
  9417: c029885
  9415: e9b546d
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 29, 2005
1 parent a226366 commit dd802e6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: c28144763a7dcdceb2c16a5ac9c8e0022d547d28
refs/heads/master: ea8a918eb71b503be13b861dbe18b93932fd6b62
6 changes: 4 additions & 2 deletions trunk/include/asm-ppc64/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ do { \

#define __get_user_nocheck(x,ptr,size) \
({ \
long __gu_err, __gu_val; \
long __gu_err; \
unsigned long __gu_val; \
might_sleep(); \
__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
(x) = (__typeof__(*(ptr)))__gu_val; \
Expand All @@ -173,7 +174,8 @@ do { \

#define __get_user_check(x,ptr,size) \
({ \
long __gu_err = -EFAULT, __gu_val = 0; \
long __gu_err = -EFAULT; \
unsigned long __gu_val = 0; \
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
might_sleep(); \
if (access_ok(VERIFY_READ,__gu_addr,size)) \
Expand Down

0 comments on commit dd802e6

Please sign in to comment.