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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
lib
/
putuser.S
diff --git
a/arch/arm/lib/putuser.S
b/arch/arm/lib/putuser.S
index
b978885
..
4593e9c
100644
(file)
--- a/
arch/arm/lib/putuser.S
+++ b/
arch/arm/lib/putuser.S
@@
-16,7
+16,7
@@
* __put_user_X
*
* Inputs: r0 contains the address
* __put_user_X
*
* Inputs: r0 contains the address
- * r
1, r2
contains the value
+ * r
2, r3
contains the value
* Outputs: r0 is the error code
* lr corrupted
*
* Outputs: r0 is the error code
* lr corrupted
*
@@
-26,39
+26,39
@@
* Note that ADDR_LIMIT is either 0 or 0xc0000000
* Note also that it is intended that __put_user_bad is not global.
*/
* Note that ADDR_LIMIT is either 0 or 0xc0000000
* Note also that it is intended that __put_user_bad is not global.
*/
-#include <asm/
constan
ts.h>
+#include <asm/
asm-offse
ts.h>
#include <asm/thread_info.h>
#include <asm/errno.h>
.global __put_user_1
__put_user_1:
#include <asm/thread_info.h>
#include <asm/errno.h>
.global __put_user_1
__put_user_1:
-1: strbt r
1
, [r0]
+1: strbt r
2
, [r0]
mov r0, #0
mov pc, lr
.global __put_user_2
__put_user_2:
mov r0, #0
mov pc, lr
.global __put_user_2
__put_user_2:
- mov ip, r
1
, lsr #8
+ mov ip, r
2
, lsr #8
#ifndef __ARMEB__
#ifndef __ARMEB__
-2: strbt r
1
, [r0], #1
+2: strbt r
2
, [r0], #1
3: strbt ip, [r0]
#else
2: strbt ip, [r0], #1
3: strbt ip, [r0]
#else
2: strbt ip, [r0], #1
-3: strbt r
1
, [r0]
+3: strbt r
2
, [r0]
#endif
mov r0, #0
mov pc, lr
.global __put_user_4
__put_user_4:
#endif
mov r0, #0
mov pc, lr
.global __put_user_4
__put_user_4:
-4: strt r
1
, [r0]
+4: strt r
2
, [r0]
mov r0, #0
mov pc, lr
.global __put_user_8
__put_user_8:
mov r0, #0
mov pc, lr
.global __put_user_8
__put_user_8:
-5: strt r
1
, [r0], #4
-6: strt r
2
, [r0]
+5: strt r
2
, [r0], #4
+6: strt r
3
, [r0]
mov r0, #0
mov pc, lr
mov r0, #0
mov pc, lr