The patch titled
asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h
has been added to the -mm tree. Its filename is
asm-generic-remove-isa_dma_threshold-in-scatterlisth.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h
From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Matt Turner <mattst88@xxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/microblaze/include/asm/scatterlist.h | 2 ++
arch/s390/include/asm/scatterlist.h | 2 ++
arch/score/include/asm/scatterlist.h | 2 ++
arch/sparc/include/asm/scatterlist.h | 2 ++
include/asm-generic/scatterlist.h | 4 ----
5 files changed, 8 insertions(+), 4 deletions(-)
diff -puN arch/microblaze/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth arch/microblaze/include/asm/scatterlist.h
--- a/arch/microblaze/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth
+++ a/arch/microblaze/include/asm/scatterlist.h
@@ -1 +1,3 @@
+#define ISA_DMA_THRESHOLD (~0UL)
+
#include <asm-generic/scatterlist.h>
diff -puN arch/s390/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth arch/s390/include/asm/scatterlist.h
--- a/arch/s390/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth
+++ a/arch/s390/include/asm/scatterlist.h
@@ -1 +1,3 @@
+#define ISA_DMA_THRESHOLD (~0UL)
+
#include <asm-generic/scatterlist.h>
diff -puN arch/score/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth arch/score/include/asm/scatterlist.h
--- a/arch/score/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth
+++ a/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 */
diff -puN arch/sparc/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth arch/sparc/include/asm/scatterlist.h
--- a/arch/sparc/include/asm/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth
+++ a/arch/sparc/include/asm/scatterlist.h
@@ -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) */
diff -puN include/asm-generic/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth include/asm-generic/scatterlist.h
--- a/include/asm-generic/scatterlist.h~asm-generic-remove-isa_dma_threshold-in-scatterlisth
+++ a/include/asm-generic/scatterlist.h
@@ -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 */
_
Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are
linux-next.patch
scsi-add-__init-__exit-macros-to-ibmvstgtc.patch
ssb-add-dma_dev-to-ssb_device-structure.patch
b43legacy-replace-the-ssb_dma-api-with-the-generic-dma-api.patch
b43-replace-the-ssb_dma-api-with-the-generic-dma-api.patch
b44-replace-the-ssb_dma-api-with-the-generic-dma-api.patch
ssb-remove-the-ssb-dma-api.patch
asm-generic-remove-isa_dma_threshold-in-scatterlisth.patch
asm-generic-add-need_sg_dma_length-to-define-sg_dma_len.patch
powerpc-use-asm-generic-scatterlisth.patch
arm-use-asm-generic-scatterlisth.patch
alpha-use-asm-generic-scatterlisth.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
