diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:57:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 19:57:46 -0800 |
| commit | 2f774456e4b9bc3d4fb3522b2482c7acfa2df197 (patch) | |
| tree | 38869c0d82a1d47cc3c9cf5c148be2e996d605ea | |
| parent | 5b3c1184e78dd7d74eced83b25af88cf1d13e686 (diff) | |
| parent | 78ad0b840848bebe266bcc8f1f9be429d2105264 (diff) | |
| download | lwn-2f774456e4b9bc3d4fb3522b2482c7acfa2df197.tar.gz lwn-2f774456e4b9bc3d4fb3522b2482c7acfa2df197.zip | |
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.
| -rw-r--r-- | include/asm-sparc64/dma.h | 11 | ||||
| -rw-r--r-- | include/asm-sparc64/floppy.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index 1bf4f7a8fbe1..a9fd06183972 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h @@ -15,17 +15,6 @@ #include <asm/delay.h> #include <asm/oplib.h> -extern spinlock_t dma_spin_lock; - -#define claim_dma_lock() \ -({ unsigned long flags; \ - spin_lock_irqsave(&dma_spin_lock, flags); \ - flags; \ -}) - -#define release_dma_lock(__flags) \ - spin_unlock_irqrestore(&dma_spin_lock, __flags); - /* These are irrelevant for Sparc DMA, but we leave it in so that * things can compile. */ diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h index dbe033e494db..331013a0053e 100644 --- a/include/asm-sparc64/floppy.h +++ b/include/asm-sparc64/floppy.h @@ -854,4 +854,15 @@ static unsigned long __init sun_floppy_init(void) #define EXTRA_FLOPPY_PARAMS +static DEFINE_SPINLOCK(dma_spin_lock); + +#define claim_dma_lock() \ +({ unsigned long flags; \ + spin_lock_irqsave(&dma_spin_lock, flags); \ + flags; \ +}) + +#define release_dma_lock(__flags) \ + spin_unlock_irqrestore(&dma_spin_lock, __flags); + #endif /* !(__ASM_SPARC64_FLOPPY_H) */ |