Commit 1ef04370 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds

asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48c7cf47
#ifndef _ALPHA_SCATTERLIST_H #ifndef _ALPHA_SCATTERLIST_H
#define _ALPHA_SCATTERLIST_H #define _ALPHA_SCATTERLIST_H
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#undef ARCH_HAS_SG_CHAIN #define ISA_DMA_THRESHOLD (~0UL)
#endif /* !(_ALPHA_SCATTERLIST_H) */ #endif /* !(_ALPHA_SCATTERLIST_H) */
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#undef ARCH_HAS_SG_CHAIN
#endif /* _ASMARM_SCATTERLIST_H */ #endif /* _ASMARM_SCATTERLIST_H */
#ifndef _ASM_IA64_SCATTERLIST_H #ifndef _ASM_IA64_SCATTERLIST_H
#define _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 * 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 * DMA-limits of ISA-devices. Nowadays, its only remaining use (apart
...@@ -10,7 +11,6 @@ ...@@ -10,7 +11,6 @@
* that's 4GB - 1. * that's 4GB - 1.
*/ */
#define ISA_DMA_THRESHOLD 0xffffffff #define ISA_DMA_THRESHOLD 0xffffffff
#define ARCH_HAS_SG_CHAIN
#include <asm-generic/scatterlist.h>
#endif /* _ASM_IA64_SCATTERLIST_H */ #endif /* _ASM_IA64_SCATTERLIST_H */
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#define ISA_DMA_THRESHOLD (~0UL)
...@@ -15,5 +15,6 @@ ...@@ -15,5 +15,6 @@
#ifdef __powerpc64__ #ifdef __powerpc64__
#define ISA_DMA_THRESHOLD (~0UL) #define ISA_DMA_THRESHOLD (~0UL)
#endif #endif
#define ARCH_HAS_SG_CHAIN
#endif /* _ASM_POWERPC_SCATTERLIST_H */ #endif /* _ASM_POWERPC_SCATTERLIST_H */
#ifndef _SPARC_SCATTERLIST_H #ifndef _SPARC_SCATTERLIST_H
#define _SPARC_SCATTERLIST_H #define _SPARC_SCATTERLIST_H
#define ISA_DMA_THRESHOLD (~0UL)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#define ISA_DMA_THRESHOLD (~0UL)
#define ARCH_HAS_SG_CHAIN
#endif /* !(_SPARC_SCATTERLIST_H) */ #endif /* !(_SPARC_SCATTERLIST_H) */
#ifndef _ASM_X86_SCATTERLIST_H #ifndef _ASM_X86_SCATTERLIST_H
#define _ASM_X86_SCATTERLIST_H #define _ASM_X86_SCATTERLIST_H
#define ISA_DMA_THRESHOLD (0x00ffffff)
#include <asm-generic/scatterlist.h> #include <asm-generic/scatterlist.h>
#define ISA_DMA_THRESHOLD (0x00ffffff)
#define ARCH_HAS_SG_CHAIN
#endif /* _ASM_X86_SCATTERLIST_H */ #endif /* _ASM_X86_SCATTERLIST_H */
...@@ -31,6 +31,4 @@ struct scatterlist { ...@@ -31,6 +31,4 @@ struct scatterlist {
#define sg_dma_len(sg) ((sg)->length) #define sg_dma_len(sg) ((sg)->length)
#endif #endif
#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