Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 136521
b: refs/heads/master
c: 4d5d783
h: refs/heads/master
i:
  136519: 369fb3e
v: v3
  • Loading branch information
Hiroshi Shimamoto authored and Ingo Molnar committed Jan 21, 2009
1 parent 250efc3 commit 5af7623
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: afb33f8c0d7dea8c48ae1c2e3af5b437aa8dd7bb
refs/heads/master: 4d5d783896fc8c37be88ee5837ca9b3c13fcd55b
6 changes: 3 additions & 3 deletions trunk/arch/x86/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ extern int __get_user_bad(void);

#define __get_user_x(size, ret, x, ptr) \
asm volatile("call __get_user_" #size \
: "=a" (ret),"=d" (x) \
: "=a" (ret), "=d" (x) \
: "0" (ptr)) \

/* Careful: we have to cast the result to the type of the pointer
Expand Down Expand Up @@ -181,7 +181,7 @@ extern int __get_user_bad(void);

#define __put_user_x(size, x, ptr, __ret_pu) \
asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
:"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
: "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")



Expand Down Expand Up @@ -276,7 +276,7 @@ do { \
__put_user_asm(x, ptr, retval, "w", "w", "ir", errret); \
break; \
case 4: \
__put_user_asm(x, ptr, retval, "l", "k", "ir", errret);\
__put_user_asm(x, ptr, retval, "l", "k", "ir", errret); \
break; \
case 8: \
__put_user_u64((__typeof__(*ptr))(x), ptr, retval); \
Expand Down

0 comments on commit 5af7623

Please sign in to comment.