Commit e177bb58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k update from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
  swim: Add missing spinlock init
parents 55529fa5 56183959

arch/m68k/include/asm/dma-mapping.h

+0 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


struct scatterlist;



#ifndef CONFIG_MMU_SUN3

static inline int dma_supported(struct device *dev, u64 mask)

{

	return 1;
@@ -111,10 +110,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) 
	return 0;

}



#else

#include <asm-generic/dma-mapping-broken.h>

#endif



/* drivers/base/dma-mapping.c */

extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,

			   void *cpu_addr, dma_addr_t dma_addr, size_t size);

arch/m68k/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o 
obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o

obj-$(CONFIG_PCI) += pcibios.o



ifndef CONFIG_MMU_SUN3

obj-y	+= dma.o

endif

obj-$(CONFIG_HAS_DMA)	+= dma.o

drivers/block/swim.c

+1 −0
Original line number Diff line number Diff line
@@ -844,6 +844,7 @@ static int swim_floppy_init(struct swim_priv *swd) 
		swd->unit[drive].swd = swd;

	}



	spin_lock_init(&swd->lock);

	swd->queue = blk_init_queue(do_fd_request, &swd->lock);

	if (!swd->queue) {

		err = -ENOMEM;