git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-parisc
/
dma.h
diff --git
a/include/asm-parisc/dma.h
b/include/asm-parisc/dma.h
index
31fd10d
..
31ad0f0
100644
(file)
--- a/
include/asm-parisc/dma.h
+++ b/
include/asm-parisc/dma.h
@@
-9,7
+9,6
@@
#ifndef _ASM_DMA_H
#define _ASM_DMA_H
#ifndef _ASM_DMA_H
#define _ASM_DMA_H
-#include <linux/config.h>
#include <asm/io.h> /* need byte IO */
#include <asm/system.h>
#include <asm/io.h> /* need byte IO */
#include <asm/system.h>
@@
-18,10
+17,10
@@
/*
** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
/*
** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
-** (or rather not merge) DMA
's into manag
able chunks.
+** (or rather not merge) DMA
s into manage
able chunks.
** On parisc, this is more of the software/tuning constraint
** On parisc, this is more of the software/tuning constraint
-** rather than the HW. I/O MMU allocation al
o
gorithms can be
-** faster with smaller size
i
s (to some degree).
+** rather than the HW. I/O MMU allocation algorithms can be
+** faster with smaller sizes (to some degree).
*/
#define DMA_CHUNK_SIZE (BITS_PER_LONG*PAGE_SIZE)
*/
#define DMA_CHUNK_SIZE (BITS_PER_LONG*PAGE_SIZE)
@@
-73,18
+72,13
@@
#define DMA2_MASK_ALL_REG 0xDE /* all-channels mask (w) */
#define DMA2_EXT_MODE_REG (0x400 | DMA2_MODE_REG)
#define DMA2_MASK_ALL_REG 0xDE /* all-channels mask (w) */
#define DMA2_EXT_MODE_REG (0x400 | DMA2_MODE_REG)
-extern spinlock_t dma_spin_lock;
-
static __inline__ unsigned long claim_dma_lock(void)
{
static __inline__ unsigned long claim_dma_lock(void)
{
- unsigned long flags;
- spin_lock_irqsave(&dma_spin_lock, flags);
- return flags;
+ return 0;
}
static __inline__ void release_dma_lock(unsigned long flags)
{
}
static __inline__ void release_dma_lock(unsigned long flags)
{
- spin_unlock_irqrestore(&dma_spin_lock, flags);
}
}