summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/getuser.S
diff options
context:
space:
mode:
authorCatalin Marinas2009-07-24 13:32:57 +0200
committerCatalin Marinas2009-07-24 13:32:57 +0200
commit8b592783a2e8b7721a99730bd549aab5208f36af (patch)
tree468636a17d31f6a29287240c63234e739eabf666 /arch/arm/lib/getuser.S
parentThumb-2: Implement the unified arch/arm/mm support (diff)
downloadkernel-qcow2-linux-8b592783a2e8b7721a99730bd549aab5208f36af.tar.gz
kernel-qcow2-linux-8b592783a2e8b7721a99730bd549aab5208f36af.tar.xz
kernel-qcow2-linux-8b592783a2e8b7721a99730bd549aab5208f36af.zip
Thumb-2: Implement the unified arch/arm/lib functions
This patch adds the ARM/Thumb-2 unified support for the arch/arm/lib/* files. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/lib/getuser.S')
-rw-r--r--arch/arm/lib/getuser.S5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 6763088b7607..a1814d927122 100644
--- 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