Commit e177bb58 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
struct scatterlist; struct scatterlist;
#ifndef CONFIG_MMU_SUN3
static inline int dma_supported(struct device *dev, u64 mask) static inline int dma_supported(struct device *dev, u64 mask)
{ {
return 1; return 1;
...@@ -111,10 +110,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) ...@@ -111,10 +110,6 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
return 0; return 0;
} }
#else
#include <asm-generic/dma-mapping-broken.h>
#endif
/* drivers/base/dma-mapping.c */ /* drivers/base/dma-mapping.c */
extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
void *cpu_addr, dma_addr_t dma_addr, size_t size); void *cpu_addr, dma_addr_t dma_addr, size_t size);
......
...@@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o ...@@ -20,7 +20,5 @@ obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o
obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o obj-$(CONFIG_MMU_SUN3) += ints.o vectors.o
obj-$(CONFIG_PCI) += pcibios.o obj-$(CONFIG_PCI) += pcibios.o
ifndef CONFIG_MMU_SUN3 obj-$(CONFIG_HAS_DMA) += dma.o
obj-y += dma.o
endif
...@@ -844,6 +844,7 @@ static int swim_floppy_init(struct swim_priv *swd) ...@@ -844,6 +844,7 @@ static int swim_floppy_init(struct swim_priv *swd)
swd->unit[drive].swd = swd; swd->unit[drive].swd = swd;
} }
spin_lock_init(&swd->lock);
swd->queue = blk_init_queue(do_fd_request, &swd->lock); swd->queue = blk_init_queue(do_fd_request, &swd->lock);
if (!swd->queue) { if (!swd->queue) {
err = -ENOMEM; err = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment