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

asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h

This is the first half of the attempt to use asm-generic/scatterlist.h
on every architecture.

There are only two ways to define scatterlist structure. So it's easy
to convert every architecture to use asm-generic/scatterlist.h.

This patch:

The trick for ISA_DMA_THRESHOLD in asm-generic/scatterlist.h doesn't work
for powerpc. This lets architectures defin ISA_DMA_THRESHOLD.

Hopefully, we can remove ISA_DMA_THRESHOLD in the future; we can do better
to decide if the bouncing is necessary or not.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
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
204f3a04 a48223f9

+8 -4
+2
arch/microblaze/include/asm/scatterlist.h
··· 1 + #define ISA_DMA_THRESHOLD (~0UL) 2 + 1 3 #include <asm-generic/scatterlist.h>
+2
arch/s390/include/asm/scatterlist.h
··· 1 + #define ISA_DMA_THRESHOLD (~0UL) 2 + 1 3 #include <asm-generic/scatterlist.h>
+2
arch/score/include/asm/scatterlist.h
··· 1 1 #ifndef _ASM_SCORE_SCATTERLIST_H 2 2 #define _ASM_SCORE_SCATTERLIST_H 3 3 4 + #define ISA_DMA_THRESHOLD (~0UL) 5 + 4 6 #include <asm-generic/scatterlist.h> 5 7 6 8 #endif /* _ASM_SCORE_SCATTERLIST_H */
+2
arch/sparc/include/asm/scatterlist.h
··· 3 3 4 4 #define sg_dma_len(sg) ((sg)->dma_length) 5 5 6 + #define ISA_DMA_THRESHOLD (~0UL) 7 + 6 8 #include <asm-generic/scatterlist.h> 7 9 8 10 #endif /* !(_SPARC_SCATTERLIST_H) */
-4
include/asm-generic/scatterlist.h
··· 34 34 #endif /* 64 bit */ 35 35 #endif /* sg_dma_len */ 36 36 37 - #ifndef ISA_DMA_THRESHOLD 38 - #define ISA_DMA_THRESHOLD (~0UL) 39 - #endif 40 - 41 37 #define ARCH_HAS_SG_CHAIN 42 38 43 39 #endif /* __ASM_GENERIC_SCATTERLIST_H */