diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 05:31:04 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 05:31:04 -0400 |
| commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
| tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /arch/arm/lib/bitops.h | |
| parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
| parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -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 52886b89706c..9f12ed1eea86 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -37,6 +37,11 @@ UNWIND( .fnstart ) | |||
| 37 | add r1, r1, r0, lsl #2 @ Get word offset | 37 | add r1, r1, r0, lsl #2 @ Get word offset |
| 38 | mov r3, r2, lsl r3 @ create mask | 38 | mov r3, r2, lsl r3 @ create mask |
| 39 | smp_dmb | 39 | smp_dmb |
| 40 | #if __LINUX_ARM_ARCH__ >= 7 && defined(CONFIG_SMP) | ||
| 41 | .arch_extension mp | ||
| 42 | ALT_SMP(W(pldw) [r1]) | ||
| 43 | ALT_UP(W(nop)) | ||
| 44 | #endif | ||
| 40 | 1: ldrex r2, [r1] | 45 | 1: ldrex r2, [r1] |
| 41 | ands r0, r2, r3 @ save old value of bit | 46 | ands r0, r2, r3 @ save old value of bit |
| 42 | \instr r2, r2, r3 @ toggle bit | 47 | \instr r2, r2, r3 @ toggle bit |