a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2013-02-20 14:27:00 -08:00
commit e177bb587e
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/m68k/include/asm/dma-mapping.h
View File

@ -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)
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);

4
arch/m68k/kernel/Makefile
View File

@ -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

1
drivers/block/swim.c
View File

@ -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;