diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-07-27 15:21:15 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-07-27 15:21:15 +0200 |
| commit | fc9eb93cd4c5d819e9a68a7906d78ce37f42d8cd (patch) | |
| tree | 821a265ae21cbc1b350afa05da413e89b89f034e /arch/frv/kernel/dma.c | |
| parent | arm64: include linux/types.h in asm/spinlock_types.h (diff) | |
| parent | atomic: Add simple atomic_t tests (diff) | |
| download | linux-fc9eb93cd4c5d819e9a68a7906d78ce37f42d8cd.tar.xz linux-fc9eb93cd4c5d819e9a68a7906d78ce37f42d8cd.zip | |
Merge branch 'locking/arch-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into aarch64/for-next/core
Merge in PeterZ's logical atomic ops so that we can implement them in
our subsequent LSE atomics.
Diffstat (limited to 'arch/frv/kernel/dma.c')
| -rw-r--r-- | arch/frv/kernel/dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/frv/kernel/dma.c b/arch/frv/kernel/dma.c index 156184e17e57..370dc9fa0b11 100644 --- a/arch/frv/kernel/dma.c +++ b/arch/frv/kernel/dma.c @@ -109,13 +109,13 @@ static struct frv_dma_channel frv_dma_channels[FRV_DMA_NCHANS] = { static DEFINE_RWLOCK(frv_dma_channels_lock); -unsigned long frv_dma_inprogress; +unsigned int frv_dma_inprogress; #define frv_clear_dma_inprogress(channel) \ - atomic_clear_mask(1 << (channel), &frv_dma_inprogress); + (void)__atomic32_fetch_and(~(1 << (channel)), &frv_dma_inprogress); #define frv_set_dma_inprogress(channel) \ - atomic_set_mask(1 << (channel), &frv_dma_inprogress); + (void)__atomic32_fetch_or(1 << (channel), &frv_dma_inprogress); /*****************************************************************************/ /* |