get rid of ARCH_HAS_SG_CHAIN turn it into selected bool in Kconfig Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/arch/Kconfig b/arch/Kconfig index f1cf895..d073798 100644 --- a/arch/Kconfig +++ b/arch/Kconfig
@@ -409,6 +409,9 @@ This spares a stack switch and improves cache usage on softirq processing. +config HAVE_SG_CHAIN + bool + # # ABI hall of shame #
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 214b698c..32a7be3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -77,15 +77,12 @@ Europe. There is an ARM Linux project with a web page at <http://www.arm.linux.org.uk/>. -config ARM_HAS_SG_CHAIN - bool - config NEED_SG_DMA_LENGTH bool config ARM_DMA_USE_IOMMU bool - select ARM_HAS_SG_CHAIN + select HAVE_SG_CHAIN select NEED_SG_DMA_LENGTH if ARM_DMA_USE_IOMMU
diff --git a/arch/arm/include/asm/scatterlist.h b/arch/arm/include/asm/scatterlist.h index cefdb8f..2f87870 100644 --- a/arch/arm/include/asm/scatterlist.h +++ b/arch/arm/include/asm/scatterlist.h
@@ -1,10 +1,6 @@ #ifndef _ASMARM_SCATTERLIST_H #define _ASMARM_SCATTERLIST_H -#ifdef CONFIG_ARM_HAS_SG_CHAIN -#define ARCH_HAS_SG_CHAIN -#endif - #include <asm/memory.h> #include <asm/types.h> #include <asm-generic/scatterlist.h>
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4e4119b..de8e64c2 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig
@@ -43,6 +43,7 @@ select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF + select HAVE_SG_CHAIN default y help The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/include/asm/scatterlist.h b/arch/ia64/include/asm/scatterlist.h index 08fd93b..c19b59d 100644 --- a/arch/ia64/include/asm/scatterlist.h +++ b/arch/ia64/include/asm/scatterlist.h
@@ -2,6 +2,5 @@ #define _ASM_IA64_SCATTERLIST_H #include <asm-generic/scatterlist.h> -#define ARCH_HAS_SG_CHAIN #endif /* _ASM_IA64_SCATTERLIST_H */
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b44b52c..4cd8b02 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig
@@ -139,6 +139,7 @@ select OLD_SIGACTION if PPC32 select HAVE_DEBUG_STACKOVERFLOW select HAVE_IRQ_EXIT_ON_IRQ_STACK + select HAVE_SG_CHAIN config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN
diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h index de1f620..1f51af5 100644 --- a/arch/powerpc/include/asm/scatterlist.h +++ b/arch/powerpc/include/asm/scatterlist.h
@@ -12,6 +12,4 @@ #include <asm/dma.h> #include <asm-generic/scatterlist.h> -#define ARCH_HAS_SG_CHAIN - #endif /* _ASM_POWERPC_SCATTERLIST_H */
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 314fced..6048901 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig
@@ -143,6 +143,7 @@ select SYSCTL_EXCEPTION_TRACE select VIRT_CPU_ACCOUNTING select VIRT_TO_BUS + select HAVE_SG_CHAIN config SCHED_OMIT_FRAME_POINTER def_bool y
diff --git a/arch/s390/include/asm/scatterlist.h b/arch/s390/include/asm/scatterlist.h index 6d45ef6..35d786f 100644 --- a/arch/s390/include/asm/scatterlist.h +++ b/arch/s390/include/asm/scatterlist.h
@@ -1,3 +1 @@ #include <asm-generic/scatterlist.h> - -#define ARCH_HAS_SG_CHAIN
diff --git a/arch/sparc/include/asm/scatterlist.h b/arch/sparc/include/asm/scatterlist.h index 92bb638..6eab378 100644 --- a/arch/sparc/include/asm/scatterlist.h +++ b/arch/sparc/include/asm/scatterlist.h
@@ -3,6 +3,4 @@ #include <asm-generic/scatterlist.h> -#define ARCH_HAS_SG_CHAIN - #endif /* !(_SPARC_SCATTERLIST_H) */
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e903c71..90d8409 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig
@@ -124,6 +124,7 @@ select RTC_LIB select HAVE_DEBUG_STACKOVERFLOW select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64 + select HAVE_SG_CHAIN config INSTRUCTION_DECODER def_bool y
diff --git a/arch/x86/include/asm/scatterlist.h b/arch/x86/include/asm/scatterlist.h index 4240878..b08f91d 100644 --- a/arch/x86/include/asm/scatterlist.h +++ b/arch/x86/include/asm/scatterlist.h
@@ -3,6 +3,4 @@ #include <asm-generic/scatterlist.h> -#define ARCH_HAS_SG_CHAIN - #endif /* _ASM_X86_SCATTERLIST_H */
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index adae88f..b0f9d44 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h
@@ -136,7 +136,7 @@ static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents, struct scatterlist *sgl) { -#ifndef ARCH_HAS_SG_CHAIN +#ifndef CONFIG_HAVE_SG_CHAIN BUG(); #endif
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 66d42edf..9391a0b 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h
@@ -31,7 +31,7 @@ * Like SCSI_MAX_SG_SEGMENTS, but for archs that have sg chaining. This limit * is totally arbitrary, a setting of 2048 will get you at least 8mb ios. */ -#ifdef ARCH_HAS_SG_CHAIN +#ifdef CONFIG_HAVE_SG_CHAIN #define SCSI_MAX_SG_CHAIN_SEGMENTS 2048 #else #define SCSI_MAX_SG_CHAIN_SEGMENTS SCSI_MAX_SG_SEGMENTS
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index d16fa29..936a7b6 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c
@@ -73,7 +73,7 @@ **/ struct scatterlist *sg_last(struct scatterlist *sgl, unsigned int nents) { -#ifndef ARCH_HAS_SG_CHAIN +#ifndef CONFIG_HAVE_SG_CHAIN struct scatterlist *ret = &sgl[nents - 1]; #else struct scatterlist *sg, *ret = NULL; @@ -251,7 +251,7 @@ if (nents == 0) return -EINVAL; -#ifndef ARCH_HAS_SG_CHAIN +#ifndef CONFIG_HAVE_SG_CHAIN if (WARN_ON_ONCE(nents > max_ents)) return -EINVAL; #endif