Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f774456 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 5b3c1184 78ad0b84

include/asm-sparc64/dma.h

+0 −11
Original line number Diff line number Diff line
@@ -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.

 */

include/asm-sparc64/floppy.h

+11 −0
Original line number Diff line number Diff line
@@ -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) */