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-arm
/
uaccess.h
diff --git
a/include/asm-arm/uaccess.h
b/include/asm-arm/uaccess.h
index
f367152
..
abda608
100644
(file)
--- a/
include/asm-arm/uaccess.h
+++ b/
include/asm-arm/uaccess.h
@@
-108,35
+108,35
@@
extern int __get_user_4(void *);
extern int __get_user_8(void *);
extern int __get_user_bad(void);
extern int __get_user_8(void *);
extern int __get_user_bad(void);
-#define __get_user_x(__r
1
,__p,__e,__s,__i...) \
+#define __get_user_x(__r
2
,__p,__e,__s,__i...) \
__asm__ __volatile__ ( \
__asm__ __volatile__ ( \
- __asmeq("%0", "r0") __asmeq("%1", "r
1
") \
+ __asmeq("%0", "r0") __asmeq("%1", "r
2
") \
"bl __get_user_" #__s \
"bl __get_user_" #__s \
- : "=&r" (__e), "=r" (__r
1
) \
+ : "=&r" (__e), "=r" (__r
2
) \
: "0" (__p) \
: __i, "cc")
#define get_user(x,p) \
({ \
const register typeof(*(p)) __user *__p asm("r0") = (p);\
: "0" (__p) \
: __i, "cc")
#define get_user(x,p) \
({ \
const register typeof(*(p)) __user *__p asm("r0") = (p);\
- register typeof(*(p)) __r
1 asm("r1
"); \
+ register typeof(*(p)) __r
2 asm("r2
"); \
register int __e asm("r0"); \
switch (sizeof(*(__p))) { \
case 1: \
register int __e asm("r0"); \
switch (sizeof(*(__p))) { \
case 1: \
- __get_user_x(__r
1
, __p, __e, 1, "lr"); \
+ __get_user_x(__r
2
, __p, __e, 1, "lr"); \
break; \
case 2: \
break; \
case 2: \
- __get_user_x(__r
1, __p, __e, 2, "r2
", "lr"); \
+ __get_user_x(__r
2, __p, __e, 2, "r3
", "lr"); \
break; \
case 4: \
break; \
case 4: \
- __get_user_x(__r
1
, __p, __e, 4, "lr"); \
+ __get_user_x(__r
2
, __p, __e, 4, "lr"); \
break; \
case 8: \
break; \
case 8: \
- __get_user_x(__r
1
, __p, __e, 8, "lr"); \
+ __get_user_x(__r
2
, __p, __e, 8, "lr"); \
break; \
default: __e = __get_user_bad(); break; \
} \
break; \
default: __e = __get_user_bad(); break; \
} \
- x = __r
1
; \
+ x = __r
2
; \
__e; \
})
__e; \
})
@@
-227,31
+227,31
@@
extern int __put_user_4(void *, unsigned int);
extern int __put_user_8(void *, unsigned long long);
extern int __put_user_bad(void);
extern int __put_user_8(void *, unsigned long long);
extern int __put_user_bad(void);
-#define __put_user_x(__r
1
,__p,__e,__s) \
+#define __put_user_x(__r
2
,__p,__e,__s) \
__asm__ __volatile__ ( \
__asm__ __volatile__ ( \
- __asmeq("%0", "r0") __asmeq("%2", "r
1
") \
+ __asmeq("%0", "r0") __asmeq("%2", "r
2
") \
"bl __put_user_" #__s \
: "=&r" (__e) \
"bl __put_user_" #__s \
: "=&r" (__e) \
- : "0" (__p), "r" (__r
1
) \
+ : "0" (__p), "r" (__r
2
) \
: "ip", "lr", "cc")
#define put_user(x,p) \
({ \
: "ip", "lr", "cc")
#define put_user(x,p) \
({ \
- const register typeof(*(p)) __r
1 asm("r1
") = (x); \
+ const register typeof(*(p)) __r
2 asm("r2
") = (x); \
const register typeof(*(p)) __user *__p asm("r0") = (p);\
register int __e asm("r0"); \
switch (sizeof(*(__p))) { \
case 1: \
const register typeof(*(p)) __user *__p asm("r0") = (p);\
register int __e asm("r0"); \
switch (sizeof(*(__p))) { \
case 1: \
- __put_user_x(__r
1
, __p, __e, 1); \
+ __put_user_x(__r
2
, __p, __e, 1); \
break; \
case 2: \
break; \
case 2: \
- __put_user_x(__r
1
, __p, __e, 2); \
+ __put_user_x(__r
2
, __p, __e, 2); \
break; \
case 4: \
break; \
case 4: \
- __put_user_x(__r
1
, __p, __e, 4); \
+ __put_user_x(__r
2
, __p, __e, 4); \
break; \
case 8: \
break; \
case 8: \
- __put_user_x(__r
1
, __p, __e, 8); \
+ __put_user_x(__r
2
, __p, __e, 8); \
break; \
default: __e = __put_user_bad(); break; \
} \
break; \
default: __e = __put_user_bad(); break; \
} \