From 604213dbc73381c8e1a6f304bfc504865324510c Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Wed, 20 Sep 2006 20:36:42 -0600 Subject: [PATCH] --- yaml --- r: 38545 b: refs/heads/master c: 99b6e9be71b9ad2c50c0d160b5af18848fee466d h: refs/heads/master i: 38543: 730442601cc01e5542590901af07ebdfbc013b8c v: v3 --- [refs] | 2 +- trunk/include/asm-parisc/dma.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f057a3e6819e..7880194aeb4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f312094556619aed849862089938c14aa6a5b84b +refs/heads/master: 99b6e9be71b9ad2c50c0d160b5af18848fee466d diff --git a/trunk/include/asm-parisc/dma.h b/trunk/include/asm-parisc/dma.h index 9979c3cb3745..da2cf373e31c 100644 --- a/trunk/include/asm-parisc/dma.h +++ b/trunk/include/asm-parisc/dma.h @@ -72,18 +72,13 @@ #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) { - unsigned long flags; - spin_lock_irqsave(&dma_spin_lock, flags); - return flags; + return 0; } static __inline__ void release_dma_lock(unsigned long flags) { - spin_unlock_irqrestore(&dma_spin_lock, flags); }