diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-06 19:10:52 -0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-06 19:11:02 -0200 |
commit | 5ddf146f70a44ed4133dea4d377b172605a1cfa5 (patch) | |
tree | 058b6f58b5ab756f9fe798983e7c7bbf75450509 /arch/arm/lib/getuser.S | |
parent | 781ba9d2ed9df07dbb413fb5ee80ef7d353841c9 (diff) | |
parent | a4a03fc7ef89020baca4f19174e6a43767c6d78a (diff) | |
download | linux-5ddf146f70a44ed4133dea4d377b172605a1cfa5.tar.gz |
Merge branch 'perf/urgent' into perf/core
So that we can get the perf bench exec stack fixes and then apply the remaining fix for the files added after what is in perf/urgent. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/lib/getuser.S')
-rw-r--r-- | arch/arm/lib/getuser.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 1b049cd7a49a..11093a7c3e32 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -31,18 +31,18 @@ #include <asm/domain.h> ENTRY(__get_user_1) -1: T(ldrb) r2, [r0] +1: TUSER(ldrb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__get_user_1) ENTRY(__get_user_2) #ifdef CONFIG_THUMB2_KERNEL -2: T(ldrb) r2, [r0] -3: T(ldrb) r3, [r0, #1] +2: TUSER(ldrb) r2, [r0] +3: TUSER(ldrb) r3, [r0, #1] #else -2: T(ldrb) r2, [r0], #1 -3: T(ldrb) r3, [r0] +2: TUSER(ldrb) r2, [r0], #1 +3: TUSER(ldrb) r3, [r0] #endif #ifndef __ARMEB__ orr r2, r2, r3, lsl #8 @@ -54,7 +54,7 @@ ENTRY(__get_user_2) ENDPROC(__get_user_2) ENTRY(__get_user_4) -4: T(ldr) r2, [r0] +4: TUSER(ldr) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__get_user_4) |