git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
asm-x86_64
/
uaccess.h
diff --git
a/include/asm-x86_64/uaccess.h
b/include/asm-x86_64/uaccess.h
index
ba3d49d
..
a7b9d33
100644
(file)
--- a/
include/asm-x86_64/uaccess.h
+++ b/
include/asm-x86_64/uaccess.h
@@
-137,6
+137,9
@@
extern void __put_user_bad(void);
#define __put_user(x,ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
#define __put_user(x,ptr) \
__put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+#define __get_user_unaligned __get_user
+#define __put_user_unaligned __put_user
+
#define __put_user_nocheck(x,ptr,size) \
({ \
int __pu_err; \
#define __put_user_nocheck(x,ptr,size) \
({ \
int __pu_err; \
@@
-351,4
+354,7
@@
long strlen_user(const char __user *str);
unsigned long clear_user(void __user *mem, unsigned long len);
unsigned long __clear_user(void __user *mem, unsigned long len);
unsigned long clear_user(void __user *mem, unsigned long len);
unsigned long __clear_user(void __user *mem, unsigned long len);
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
#endif /* __X86_64_UACCESS_H */
#endif /* __X86_64_UACCESS_H */