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.5.x5
[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
a7b9d33
..
cc37523
100644
(file)
--- a/
include/asm-x86_64/uaccess.h
+++ b/
include/asm-x86_64/uaccess.h
@@
-102,7
+102,7
@@
extern void __get_user_8(void);
/* Careful: we have to cast the result to the type of the pointer for sign reasons */
#define get_user(x,ptr) \
/* Careful: we have to cast the result to the type of the pointer for sign reasons */
#define get_user(x,ptr) \
-({
long __val_gu;
\
+({
unsigned long __val_gu;
\
int __ret_gu; \
__chk_user_ptr(ptr); \
switch(sizeof (*(ptr))) { \
int __ret_gu; \
__chk_user_ptr(ptr); \
switch(sizeof (*(ptr))) { \
@@
-172,7
+172,7
@@
do { \
/* FIXME: this hack is definitely wrong -AK */
struct __large_struct { unsigned long buf[100]; };
/* FIXME: this hack is definitely wrong -AK */
struct __large_struct { unsigned long buf[100]; };
-#define __m(x) (*(struct __large_struct *)(x))
+#define __m(x) (*(struct __large_struct
__user
*)(x))
/*
* Tell gcc we read from memory instead of writing: this is because
/*
* Tell gcc we read from memory instead of writing: this is because
@@
-198,7
+198,7
@@
struct __large_struct { unsigned long buf[100]; };
#define __get_user_nocheck(x,ptr,size) \
({ \
int __gu_err; \
#define __get_user_nocheck(x,ptr,size) \
({ \
int __gu_err; \
-
long __gu_val;
\
+
unsigned long __gu_val;
\
__get_user_size(__gu_val,(ptr),(size),__gu_err); \
(x) = (__typeof__(*(ptr)))__gu_val; \
__gu_err; \
__get_user_size(__gu_val,(ptr),(size),__gu_err); \
(x) = (__typeof__(*(ptr)))__gu_val; \
__gu_err; \