diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 05:58:59 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 05:58:59 -0500 |
| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /arch/arm/lib | |
| parent | ec1e20a02fe33b767ffcca8920a32211492416d7 (diff) | |
| parent | 70d42126877b9faa272d446a6de5917614c28dd9 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bitops.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index d6408d1ee543..e0c68d5bb7dc 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -10,6 +10,11 @@ UNWIND( .fnstart ) | |||
| 10 | and r3, r0, #31 @ Get bit offset | 10 | and r3, r0, #31 @ Get bit offset |
| 11 | mov r0, r0, lsr #5 | 11 | mov r0, r0, lsr #5 |
| 12 | add r1, r1, r0, lsl #2 @ Get word offset | 12 | add r1, r1, r0, lsl #2 @ Get word offset |
| 13 | #if __LINUX_ARM_ARCH__ >= 7 | ||
| 14 | .arch_extension mp | ||
| 15 | ALT_SMP(W(pldw) [r1]) | ||
| 16 | ALT_UP(W(nop)) | ||
| 17 | #endif | ||
| 13 | mov r3, r2, lsl r3 | 18 | mov r3, r2, lsl r3 |
| 14 | 1: ldrex r2, [r1] | 19 | 1: ldrex r2, [r1] |
| 15 | \instr r2, r2, r3 | 20 | \instr r2, r2, r3 |