diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/arm/lib/getuser.S | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/lib/getuser.S')
| -rw-r--r-- | arch/arm/lib/getuser.S | 5 |
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) | |||
| 36 | ENDPROC(__get_user_1) | 36 | ENDPROC(__get_user_1) |
| 37 | 37 | ||
| 38 | ENTRY(__get_user_2) | 38 | ENTRY(__get_user_2) |
| 39 | #ifdef CONFIG_THUMB2_KERNEL | ||
| 40 | 2: ldrbt r2, [r0] | ||
| 41 | 3: ldrbt r3, [r0, #1] | ||
| 42 | #else | ||
| 39 | 2: ldrbt r2, [r0], #1 | 43 | 2: ldrbt r2, [r0], #1 |
| 40 | 3: ldrbt r3, [r0] | 44 | 3: ldrbt r3, [r0] |
| 45 | #endif | ||
| 41 | #ifndef __ARMEB__ | 46 | #ifndef __ARMEB__ |
| 42 | orr r2, r2, r3, lsl #8 | 47 | orr r2, r2, r3, lsl #8 |
| 43 | #else | 48 | #else |