Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix floppy build failure.
+11
-11
-11
include/asm-sparc64/dma.h
-11
include/asm-sparc64/dma.h
···
15
15
#include <asm/delay.h>
16
16
#include <asm/oplib.h>
17
17
18
-
extern spinlock_t dma_spin_lock;
19
-
20
-
#define claim_dma_lock() \
21
-
({ unsigned long flags; \
22
-
spin_lock_irqsave(&dma_spin_lock, flags); \
23
-
flags; \
24
-
})
25
-
26
-
#define release_dma_lock(__flags) \
27
-
spin_unlock_irqrestore(&dma_spin_lock, __flags);
28
-
29
18
/* These are irrelevant for Sparc DMA, but we leave it in so that
30
19
* things can compile.
31
20
*/
+11
include/asm-sparc64/floppy.h
+11
include/asm-sparc64/floppy.h
···
854
854
855
855
#define EXTRA_FLOPPY_PARAMS
856
856
857
+
static DEFINE_SPINLOCK(dma_spin_lock);
858
+
859
+
#define claim_dma_lock() \
860
+
({ unsigned long flags; \
861
+
spin_lock_irqsave(&dma_spin_lock, flags); \
862
+
flags; \
863
+
})
864
+
865
+
#define release_dma_lock(__flags) \
866
+
spin_unlock_irqrestore(&dma_spin_lock, __flags);
867
+
857
868
#endif /* !(__ASM_SPARC64_FLOPPY_H) */