From: Stephen Rothwell Date: Thu, 29 Nov 2012 03:18:17 +0000 (+1100) Subject: Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS X-Git-Tag: next-20121205~1^2~206 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=15be212271bc1abe4729681b814b5dddd6258433;p=karo-tx-linux.git Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS Make it easier for more architectures to select it and thus disable drivers that use virt_to_bus(). Signed-off-by: Stephen Rothwell Cc: Bjorn Helgaas Cc: H Hartley Sweeten Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Paul Mundt Cc: Geert Uytterhoeven Reviewed-by: James Hogan Acked-by: David S. Miller Signed-off-by: Andrew Morton --- diff --git a/arch/Kconfig b/arch/Kconfig index 34884faf98cd..3ad5bbb275bf 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -271,6 +271,13 @@ config ARCH_WANT_OLD_COMPAT_IPC select ARCH_WANT_COMPAT_IPC_PARSE_VERSION bool +config ARCH_NO_VIRT_TO_BUS + bool + help + An architecture should select this if it cannot (or will not) + implement virt_to_bus(). All new architectures should probably + select this. + config GENERIC_KERNEL_THREAD bool diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8e606633bfd3..5fbd13b29d49 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -87,9 +87,6 @@ config GENERIC_GPIO help Generic GPIO API support -config ARCH_NO_VIRT_TO_BUS - def_bool PPC64 - config PPC bool default y @@ -101,6 +98,7 @@ config PPC select HAVE_FUNCTION_GRAPH_TRACER select SYSCTL_EXCEPTION_TRACE select ARCH_WANT_OPTIONAL_GPIOLIB + select ARCH_NO_VIRT_TO_BUS if PPC64 select HAVE_IDE select HAVE_IOREMAP_PROT select HAVE_EFFICIENT_UNALIGNED_ACCESS diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 279ece3957c7..3282046bf1c8 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -15,6 +15,7 @@ config SUPERH select HAVE_DEBUG_BUGVERBOSE select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) + select ARCH_NO_VIRT_TO_BUS select PERF_USE_VMALLOC select HAVE_DEBUG_KMEMLEAK select HAVE_KERNEL_GZIP @@ -151,9 +152,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config ARCH_NO_VIRT_TO_BUS - def_bool y - config ARCH_HAS_DEFAULT_IDLE def_bool y diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 61b722e854b0..123d604a3f66 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -21,6 +21,7 @@ config SPARC select SYSCTL_EXCEPTION_TRACE select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE + select ARCH_NO_VIRT_TO_BUS select RTC_CLASS select RTC_DRV_M48T59 select HAVE_DMA_ATTRS @@ -144,9 +145,6 @@ config GENERIC_GPIO help Generic GPIO API support -config ARCH_NO_VIRT_TO_BUS - def_bool y - config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y if SPARC64