diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/kernel/entry-armv.S | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index a866dce611d0..8e2dacdbdccb 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -822,7 +822,7 @@ __kuser_helper_start: | |||
| 822 | */ | 822 | */ |
| 823 | 823 | ||
| 824 | __kuser_memory_barrier: @ 0xffff0fa0 | 824 | __kuser_memory_barrier: @ 0xffff0fa0 |
| 825 | smp_dmb | 825 | smp_dmb arm |
| 826 | usr_ret lr | 826 | usr_ret lr |
| 827 | 827 | ||
| 828 | .align 5 | 828 | .align 5 |
| @@ -939,7 +939,7 @@ kuser_cmpxchg_fixup: | |||
| 939 | 939 | ||
| 940 | #else | 940 | #else |
| 941 | 941 | ||
| 942 | smp_dmb | 942 | smp_dmb arm |
| 943 | 1: ldrex r3, [r2] | 943 | 1: ldrex r3, [r2] |
| 944 | subs r3, r3, r0 | 944 | subs r3, r3, r0 |
| 945 | strexeq r3, r1, [r2] | 945 | strexeq r3, r1, [r2] |