diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/asm-sparc64/dma.h | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/asm-sparc64/dma.h')
-rw-r--r-- | include/asm-sparc64/dma.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index aedfa7ddd..e6175ab4f 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.8 1998/04/13 07:27:06 davem Exp $ +/* $Id: dma.h,v 1.10 1998/10/27 23:28:50 davem Exp $ * include/asm-sparc64/dma.h * * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu) @@ -13,6 +13,18 @@ #include <asm/sbus.h> #include <asm/delay.h> #include <asm/oplib.h> +#include <asm/spinlock.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. |