projects/linux·commit 58ba81db

[PATCH] m68k/kernel/dma.c assumes !MMU_SUN3

58ba81db · Al Viro <[email protected]> · 2006-10-09 02:11:47 +01:00

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
58ba81dba77eab43633ea47d82e96245ae3ff666
Parents
1622605c

Changes

2 files changed · +7 −1

FileStatusAddDelContent
arch/m68k/kernel/Makefilemodified+2−1View file
include/asm-m68k/dma-mapping.hmodified+5−0View file

arch/m68k/kernel/Makefile

View file
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index dae6097..1c9ecaa 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -9,10 +9,11 @@ else
endif
extra-y += vmlinux.lds
-obj-y := entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \
+obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \
sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o
obj-$(CONFIG_PCI) += bios32.o
obj-$(CONFIG_MODULES) += module.o
+obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo
EXTRA_AFLAGS := -traditional

include/asm-m68k/dma-mapping.h

View file
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h
index c1299c3..d90d841 100644
--- a/include/asm-m68k/dma-mapping.h
+++ b/include/asm-m68k/dma-mapping.h
@@ -5,6 +5,7 @@
struct scatterlist;
+#ifndef CONFIG_MMU_SUN3
static inline int dma_supported(struct device *dev, u64 mask)
{
return 1;
@@ -88,4 +89,8 @@ static inline int dma_mapping_error(dma_addr_t handle)
return 0;
}
+#else
+#include <asm-generic/dma-mapping-broken.h>
+#endif
+
#endif /* _M68K_DMA_MAPPING_H */