Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

alpha: use asm-generic/scatterlist.h

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

FUJITA Tomonori and committed by
Linus Torvalds
48c7cf47 e32205eb

+7 -19
+3
arch/alpha/Kconfig
··· 61 61 config NEED_DMA_MAP_STATE 62 62 def_bool y 63 63 64 + config NEED_SG_DMA_LENGTH 65 + def_bool y 66 + 64 67 config GENERIC_ISA_DMA 65 68 bool 66 69 default y
+4 -19
arch/alpha/include/asm/scatterlist.h
··· 1 1 #ifndef _ALPHA_SCATTERLIST_H 2 2 #define _ALPHA_SCATTERLIST_H 3 3 4 - #include <asm/page.h> 5 - #include <asm/types.h> 6 - 7 - struct scatterlist { 8 - #ifdef CONFIG_DEBUG_SG 9 - unsigned long sg_magic; 10 - #endif 11 - unsigned long page_link; 12 - unsigned int offset; 13 - 14 - unsigned int length; 15 - 16 - dma_addr_t dma_address; 17 - __u32 dma_length; 18 - }; 19 - 20 - #define sg_dma_address(sg) ((sg)->dma_address) 21 - #define sg_dma_len(sg) ((sg)->dma_length) 22 - 23 4 #define ISA_DMA_THRESHOLD (~0UL) 5 + 6 + #include <asm-generic/scatterlist.h> 7 + 8 + #undef ARCH_HAS_SG_CHAIN 24 9 25 10 #endif /* !(_ALPHA_SCATTERLIST_H) */