Commit 204f3a04 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds

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: default avatarFUJITA 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a48223f9
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#ifndef _ASM_SCORE_SCATTERLIST_H #ifndef _ASM_SCORE_SCATTERLIST_H
#define _ASM_SCORE_SCATTERLIST_H #define _ASM_SCORE_SCATTERLIST_H
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#endif /* _ASM_SCORE_SCATTERLIST_H */ #endif /* _ASM_SCORE_SCATTERLIST_H */
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#define sg_dma_len(sg) ((sg)->dma_length) #define sg_dma_len(sg) ((sg)->dma_length)
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#endif /* !(_SPARC_SCATTERLIST_H) */ #endif /* !(_SPARC_SCATTERLIST_H) */
...@@ -34,10 +34,6 @@ struct scatterlist { ...@@ -34,10 +34,6 @@ struct scatterlist {
#endif /* 64 bit */ #endif /* 64 bit */
#endif /* sg_dma_len */ #endif /* sg_dma_len */
#ifndef ISA_DMA_THRESHOLD
#define ISA_DMA_THRESHOLD (~0UL)
#endif
#define ARCH_HAS_SG_CHAIN #define ARCH_HAS_SG_CHAIN
#endif /* __ASM_GENERIC_SCATTERLIST_H */ #endif /* __ASM_GENERIC_SCATTERLIST_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment