Commit 58ba81db authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1622605c

arch/m68k/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE