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
/
getuser.S
diff --git
a/arch/arm/lib/getuser.S
b/arch/arm/lib/getuser.S
index
64aa6f4
..
c03ea8e
100644
(file)
--- a/
arch/arm/lib/getuser.S
+++ b/
arch/arm/lib/getuser.S
@@
-26,7
+26,7
@@
* Note that ADDR_LIMIT is either 0 or 0xc0000000.
* Note also that it is intended that __get_user_bad is not global.
*/
* Note that ADDR_LIMIT is either 0 or 0xc0000000.
* Note also that it is intended that __get_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>
#include <asm/thread_info.h>
#include <asm/errno.h>
@@
-54,15
+54,6
@@
__get_user_4:
mov r0, #0
mov pc, lr
mov r0, #0
mov pc, lr
- .global __get_user_8
-__get_user_8:
-5: ldrt r2, [r0], #4
-6: ldrt r3, [r0]
- mov r0, #0
- mov pc, lr
-
-__get_user_bad_8:
- mov r3, #0
__get_user_bad:
mov r2, #0
mov r0, #-EFAULT
__get_user_bad:
mov r2, #0
mov r0, #-EFAULT
@@
-73,6
+64,4
@@
__get_user_bad:
.long 2b, __get_user_bad
.long 3b, __get_user_bad
.long 4b, __get_user_bad
.long 2b, __get_user_bad
.long 3b, __get_user_bad
.long 4b, __get_user_bad
- .long 5b, __get_user_bad_8
- .long 6b, __get_user_bad_8
.previous
.previous