Home » Mailing list archives » linux-kernel » 2010 » April » 5

[PATCH -mm 01/12] asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: FUJITA Tomonori
Subject: [PATCH -mm 01/12] asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h
Date: Monday, April 5, 2010 - 4:52 pm

There are more architectures that don't support ARCH_HAS_SG_CHAIN than
those that support it. This removes removes ARCH_HAS_SG_CHAIN in
asm-generic/scatterlist.h and lets arhictectures to define it.

It's clearer than defining ARCH_HAS_SG_CHAIN asm-generic/scatterlist.h
and undefing it in arhictectures that don't support it.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 arch/alpha/include/asm/scatterlist.h      |    4 +---
 arch/arm/include/asm/scatterlist.h        |    3 ---
 arch/ia64/include/asm/scatterlist.h       |    4 ++--
 arch/microblaze/include/asm/scatterlist.h |    4 ++--
 arch/powerpc/include/asm/scatterlist.h    |    1 +
 arch/sparc/include/asm/scatterlist.h      |    5 +++--
 arch/x86/include/asm/scatterlist.h        |    5 +++--
 include/asm-generic/scatterlist.h         |    2 --
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h
index 85a0ef2..5728c52 100644
--- a/arch/alpha/include/asm/scatterlist.h
+++ b/arch/alpha/include/asm/scatterlist.h
@@ -1,10 +1,8 @@
 #ifndef _ALPHA_SCATTERLIST_H
 #define _ALPHA_SCATTERLIST_H
 
-#define ISA_DMA_THRESHOLD (~0UL)
-
 #include <asm-generic/scatterlist.h>
 
-#undef ARCH_HAS_SG_CHAIN
+#define ISA_DMA_THRESHOLD (~0UL)
 
 #endif /* !(_ALPHA_SCATTERLIST_H) */
diff --git a/arch/arm/include/asm/scatterlist.h b/arch/arm/include/asm/scatterlist.h
index bcda59f..2f87870 100644
--- a/arch/arm/include/asm/scatterlist.h
+++ b/arch/arm/include/asm/scatterlist.h
@@ -3,9 +3,6 @@
 
 #include <asm/memory.h>
 #include <asm/types.h>
-
 #include <asm-generic/scatterlist.h>
 
-#undef ARCH_HAS_SG_CHAIN
-
 #endif /* _ASMARM_SCATTERLIST_H */
diff --git a/arch/ia64/include/asm/scatterlist.h b/arch/ia64/include/asm/scatterlist.h
index d8e9896..f299a4f 100644
--- a/arch/ia64/include/asm/scatterlist.h
+++ b/arch/ia64/include/asm/scatterlist.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_IA64_SCATTERLIST_H
 #define _ASM_IA64_SCATTERLIST_H
 
+#include <asm-generic/scatterlist.h>
 /*
  * It used to be that ISA_DMA_THRESHOLD had something to do with the
  * DMA-limits of ISA-devices.  Nowadays, its only remaining use (apart
@@ -10,7 +11,6 @@
  * that's 4GB - 1.
  */
 #define ISA_DMA_THRESHOLD	0xffffffff
-
-#include <asm-generic/scatterlist.h>
+#define ARCH_HAS_SG_CHAIN
 
 #endif /* _ASM_IA64_SCATTERLIST_H */
diff --git a/arch/microblaze/include/asm/scatterlist.h b/arch/microblaze/include/asm/scatterlist.h
index be44d94..dc4a890 100644
--- a/arch/microblaze/include/asm/scatterlist.h
+++ b/arch/microblaze/include/asm/scatterlist.h
@@ -1,3 +1,3 @@
-#define ISA_DMA_THRESHOLD	(~0UL)
-
 #include <asm-generic/scatterlist.h>
+
+#define ISA_DMA_THRESHOLD	(~0UL)
diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h
index 4ae35da..34cc78f 100644
--- a/arch/powerpc/include/asm/scatterlist.h
+++ b/arch/powerpc/include/asm/scatterlist.h
@@ -15,5 +15,6 @@
 #ifdef __powerpc64__
 #define ISA_DMA_THRESHOLD	(~0UL)
 #endif
+#define ARCH_HAS_SG_CHAIN
 
 #endif /* _ASM_POWERPC_SCATTERLIST_H */
diff --git a/arch/sparc/include/asm/scatterlist.h b/arch/sparc/include/asm/scatterlist.h
index 69d21bb..433e45f 100644
--- a/arch/sparc/include/asm/scatterlist.h
+++ b/arch/sparc/include/asm/scatterlist.h
@@ -1,8 +1,9 @@
 #ifndef _SPARC_SCATTERLIST_H
 #define _SPARC_SCATTERLIST_H
 
-#define ISA_DMA_THRESHOLD	(~0UL)
-
 #include <asm-generic/scatterlist.h>
 
+#define ISA_DMA_THRESHOLD	(~0UL)
+#define ARCH_HAS_SG_CHAIN
+
 #endif /* !(_SPARC_SCATTERLIST_H) */
diff --git a/arch/x86/include/asm/scatterlist.h b/arch/x86/include/asm/scatterlist.h
index 75af592..fb0b187 100644
--- a/arch/x86/include/asm/scatterlist.h
+++ b/arch/x86/include/asm/scatterlist.h
@@ -1,8 +1,9 @@
 #ifndef _ASM_X86_SCATTERLIST_H
 #define _ASM_X86_SCATTERLIST_H
 
-#define ISA_DMA_THRESHOLD (0x00ffffff)
-
 #include <asm-generic/scatterlist.h>
 
+#define ISA_DMA_THRESHOLD (0x00ffffff)
+#define ARCH_HAS_SG_CHAIN
+
 #endif /* _ASM_X86_SCATTERLIST_H */
diff --git a/include/asm-generic/scatterlist.h b/include/asm-generic/scatterlist.h
index 5e08794..5de0735 100644
--- a/include/asm-generic/scatterlist.h
+++ b/include/asm-generic/scatterlist.h
@@ -31,6 +31,4 @@ struct scatterlist {
 #define sg_dma_len(sg)		((sg)->length)
 #endif
 
-#define ARCH_HAS_SG_CHAIN
-
 #endif /* __ASM_GENERIC_SCATTERLIST_H */
-- 
1.7.0

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH -mm 00/12] use asm-generic/scatterlist.h on every a ..., FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 01/12] asm-generic: remove ARCH_HAS_SG_CHAIN in ..., FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 02/12] avr32: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 03/12] cris: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 04/12] h8300: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 05/12] m32r: use use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 07/12] mips: use use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 08/12] xtensa: use use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 09/12] blackfin: use use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 10/12] frv: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 11/12] mn10300: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
[PATCH -mm 12/12] parisc: use asm-generic/scatterlist.h, FUJITA Tomonori, (Mon Apr 5, 4:52 pm)
Re: [PATCH -mm 02/12] avr32: use asm-generic/scatterlist.h, Haavard Skinnemoen, (Tue Apr 6, 6:38 am)
Re: [PATCH -mm 02/12] avr32: use asm-generic/scatterlist.h, FUJITA Tomonori, (Tue Apr 6, 4:55 pm)
Re: [PATCH -mm 09/12] blackfin: use use asm-generic/scatte ..., Mike Frysinger, (Wed Apr 7, 8:51 pm)
Re: [PATCH -mm 09/12] blackfin: use use asm-generic/scatte ..., FUJITA Tomonori, (Wed Apr 7, 10:00 pm)
Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h, Geert Uytterhoeven, (Fri Apr 23, 1:29 am)
Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h, FUJITA Tomonori, (Sun Apr 25, 6:46 am)
Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h, Geert Uytterhoeven, (Sun Apr 25, 11:17 am)