Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 308c09f1 authored by Laura Abbott's avatar Laura Abbott Committed by Linus Torvalds
Browse files

lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig 



Rather than have architectures #define ARCH_HAS_SG_CHAIN in an
architecture specific scatterlist.h, make it a proper Kconfig option and
use that instead.  At same time, remove the header files are are now
mostly useless and just include asm-generic/scatterlist.h.

[sfr@canb.auug.org.au: powerpc files now need asm/dma.h]
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>			[x86]
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>	[powerpc]
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f137d66

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config ARM 
	  <http://www.arm.linux.org.uk/>.



config ARM_HAS_SG_CHAIN

	select ARCH_HAS_SG_CHAIN

	bool



config NEED_SG_DMA_LENGTH

arch/arm/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ generic-y += poll.h 
generic-y += preempt.h

generic-y += resource.h

generic-y += rwsem.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += segment.h

generic-y += sembuf.h

arch/arm/include/asm/scatterlist.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#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>



#endif /* _ASMARM_SCATTERLIST_H */

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ARM64

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_ATOMIC_RMW

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config IA64 
	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_VIRT_CPU_ACCOUNTING

	select ARCH_HAS_SG_CHAIN

	select VIRT_TO_BUS

	select ARCH_DISCARD_MEMBLOCK

	select GENERIC_IRQ_PROBE