git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
dma.h
diff --git
a/arch/arm/include/asm/dma.h
b/arch/arm/include/asm/dma.h
index
628670e
..
69a5b0b
100644
(file)
--- a/
arch/arm/include/asm/dma.h
+++ b/
arch/arm/include/asm/dma.h
@@
-34,18
+34,18
@@
#define DMA_MODE_CASCADE 0xc0
#define DMA_AUTOINIT 0x10
#define DMA_MODE_CASCADE 0xc0
#define DMA_AUTOINIT 0x10
-extern spinlock_t dma_spin_lock;
+extern
raw_
spinlock_t dma_spin_lock;
static inline unsigned long claim_dma_lock(void)
{
unsigned long flags;
static inline unsigned long claim_dma_lock(void)
{
unsigned long flags;
- spin_lock_irqsave(&dma_spin_lock, flags);
+
raw_
spin_lock_irqsave(&dma_spin_lock, flags);
return flags;
}
static inline void release_dma_lock(unsigned long flags)
{
return flags;
}
static inline void release_dma_lock(unsigned long flags)
{
- spin_unlock_irqrestore(&dma_spin_lock, flags);
+
raw_
spin_unlock_irqrestore(&dma_spin_lock, flags);
}
/* Clear the 'DMA Pointer Flip Flop'.
}
/* Clear the 'DMA Pointer Flip Flop'.