git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Thumb-2: Implement the unified arch/arm/lib functions
[safe/jmp/linux-2.6]
/
arch
/
arm
/
lib
/
getuser.S
diff --git
a/arch/arm/lib/getuser.S
b/arch/arm/lib/getuser.S
index
6763088
..
a1814d9
100644
(file)
--- a/
arch/arm/lib/getuser.S
+++ b/
arch/arm/lib/getuser.S
@@
-36,8
+36,13
@@
ENTRY(__get_user_1)
ENDPROC(__get_user_1)
ENTRY(__get_user_2)
+#ifdef CONFIG_THUMB2_KERNEL
+2: ldrbt r2, [r0]
+3: ldrbt r3, [r0, #1]
+#else
2: ldrbt r2, [r0], #1
3: ldrbt r3, [r0]
+#endif
#ifndef __ARMEB__
orr r2, r2, r3, lsl #8
#else