Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
frv
/
kernel
/
dma.c
diff --git
a/kernel/arch/frv/kernel/dma.c
b/kernel/arch/frv/kernel/dma.c
index
156184e
..
370dc9f
100644
(file)
--- a/
kernel/arch/frv/kernel/dma.c
+++ b/
kernel/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);
static DEFINE_RWLOCK(frv_dma_channels_lock);
-unsigned
long
frv_dma_inprogress;
+unsigned
int
frv_dma_inprogress;
#define frv_clear_dma_inprogress(channel) \
#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) \
#define frv_set_dma_inprogress(channel) \
-
atomic_set_mask
(1 << (channel), &frv_dma_inprogress);
+
(void)__atomic32_fetch_or
(1 << (channel), &frv_dma_inprogress);
/*****************************************************************************/
/*
/*****************************************************************************/
/*