Skip to content

Commit

Permalink
asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
fujita authored and torvalds committed May 27, 2010
1 parent a48223f commit 204f3a0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions arch/microblaze/include/asm/scatterlist.h
@@ -1 +1,3 @@
#define ISA_DMA_THRESHOLD (~0UL)

#include <asm-generic/scatterlist.h>
2 changes: 2 additions & 0 deletions arch/s390/include/asm/scatterlist.h
@@ -1 +1,3 @@
#define ISA_DMA_THRESHOLD (~0UL)

#include <asm-generic/scatterlist.h>
2 changes: 2 additions & 0 deletions arch/score/include/asm/scatterlist.h
@@ -1,6 +1,8 @@
#ifndef _ASM_SCORE_SCATTERLIST_H
#define _ASM_SCORE_SCATTERLIST_H

#define ISA_DMA_THRESHOLD (~0UL)

#include <asm-generic/scatterlist.h>

#endif /* _ASM_SCORE_SCATTERLIST_H */
2 changes: 2 additions & 0 deletions arch/sparc/include/asm/scatterlist.h
Expand Up @@ -3,6 +3,8 @@

#define sg_dma_len(sg) ((sg)->dma_length)

#define ISA_DMA_THRESHOLD (~0UL)

#include <asm-generic/scatterlist.h>

#endif /* !(_SPARC_SCATTERLIST_H) */
4 changes: 0 additions & 4 deletions include/asm-generic/scatterlist.h
Expand Up @@ -34,10 +34,6 @@ struct scatterlist {
#endif /* 64 bit */
#endif /* sg_dma_len */

#ifndef ISA_DMA_THRESHOLD
#define ISA_DMA_THRESHOLD (~0UL)
#endif

#define ARCH_HAS_SG_CHAIN

#endif /* __ASM_GENERIC_SCATTERLIST_H */

0 comments on commit 204f3a0

Please sign in to comment.