Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS

Change it to CONFIG_HAVE_VIRT_TO_BUS and set it in all architecures
that already provide virt_to_bus().

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Stephen Rothwell and committed by
Linus Torvalds
887cbce0 31b4ca3e

+30 -10
+7
arch/Kconfig
··· 303 303 select ARCH_WANT_COMPAT_IPC_PARSE_VERSION 304 304 bool 305 305 306 + config HAVE_VIRT_TO_BUS 307 + bool 308 + help 309 + An architecture should select this if it implements the 310 + deprecated interface virt_to_bus(). All new architectures 311 + should probably not select this. 312 + 306 313 config HAVE_ARCH_SECCOMP_FILTER 307 314 bool 308 315 help
+1
arch/alpha/Kconfig
··· 9 9 select HAVE_PERF_EVENTS 10 10 select HAVE_DMA_ATTRS 11 11 select HAVE_GENERIC_HARDIRQS 12 + select HAVE_VIRT_TO_BUS 12 13 select GENERIC_IRQ_PROBE 13 14 select AUTO_IRQ_AFFINITY if SMP 14 15 select GENERIC_IRQ_SHOW
+1
arch/arm/Kconfig
··· 49 49 select HAVE_REGS_AND_STACK_ACCESS_API 50 50 select HAVE_SYSCALL_TRACEPOINTS 51 51 select HAVE_UID16 52 + select HAVE_VIRT_TO_BUS 52 53 select KTIME_SCALAR 53 54 select PERF_USE_VMALLOC 54 55 select RTC_LIB
+1
arch/avr32/Kconfig
··· 7 7 select HAVE_OPROFILE 8 8 select HAVE_KPROBES 9 9 select HAVE_GENERIC_HARDIRQS 10 + select HAVE_VIRT_TO_BUS 10 11 select GENERIC_IRQ_PROBE 11 12 select GENERIC_ATOMIC64 12 13 select HARDIRQS_SW_RESEND
+1
arch/blackfin/Kconfig
··· 33 33 select ARCH_HAVE_CUSTOM_GPIO_H 34 34 select ARCH_WANT_OPTIONAL_GPIOLIB 35 35 select HAVE_UID16 36 + select HAVE_VIRT_TO_BUS 36 37 select ARCH_WANT_IPC_PARSE_VERSION 37 38 select HAVE_GENERIC_HARDIRQS 38 39 select GENERIC_ATOMIC64
+1
arch/cris/Kconfig
··· 43 43 select GENERIC_ATOMIC64 44 44 select HAVE_GENERIC_HARDIRQS 45 45 select HAVE_UID16 46 + select HAVE_VIRT_TO_BUS 46 47 select ARCH_WANT_IPC_PARSE_VERSION 47 48 select GENERIC_IRQ_SHOW 48 49 select GENERIC_IOMAP
+1
arch/frv/Kconfig
··· 6 6 select HAVE_PERF_EVENTS 7 7 select HAVE_UID16 8 8 select HAVE_GENERIC_HARDIRQS 9 + select HAVE_VIRT_TO_BUS 9 10 select GENERIC_IRQ_SHOW 10 11 select HAVE_DEBUG_BUGVERBOSE 11 12 select ARCH_HAVE_NMI_SAFE_CMPXCHG
+1
arch/h8300/Kconfig
··· 5 5 select HAVE_GENERIC_HARDIRQS 6 6 select GENERIC_ATOMIC64 7 7 select HAVE_UID16 8 + select HAVE_VIRT_TO_BUS 8 9 select ARCH_WANT_IPC_PARSE_VERSION 9 10 select GENERIC_IRQ_SHOW 10 11 select GENERIC_CPU_DEVICES
+1
arch/ia64/Kconfig
··· 26 26 select HAVE_MEMBLOCK 27 27 select HAVE_MEMBLOCK_NODE_MAP 28 28 select HAVE_VIRT_CPU_ACCOUNTING 29 + select HAVE_VIRT_TO_BUS 29 30 select ARCH_DISCARD_MEMBLOCK 30 31 select GENERIC_IRQ_PROBE 31 32 select GENERIC_PENDING_IRQ if SMP
+1
arch/m32r/Kconfig
··· 10 10 select ARCH_WANT_IPC_PARSE_VERSION 11 11 select HAVE_DEBUG_BUGVERBOSE 12 12 select HAVE_GENERIC_HARDIRQS 13 + select HAVE_VIRT_TO_BUS 13 14 select GENERIC_IRQ_PROBE 14 15 select GENERIC_IRQ_SHOW 15 16 select GENERIC_ATOMIC64
+1
arch/m68k/Kconfig
··· 8 8 select GENERIC_IRQ_SHOW 9 9 select GENERIC_ATOMIC64 10 10 select HAVE_UID16 11 + select HAVE_VIRT_TO_BUS 11 12 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS 12 13 select GENERIC_CPU_DEVICES 13 14 select GENERIC_STRNCPY_FROM_USER if MMU
+1
arch/microblaze/Kconfig
··· 19 19 select HAVE_DEBUG_KMEMLEAK 20 20 select IRQ_DOMAIN 21 21 select HAVE_GENERIC_HARDIRQS 22 + select HAVE_VIRT_TO_BUS 22 23 select GENERIC_IRQ_PROBE 23 24 select GENERIC_IRQ_SHOW 24 25 select GENERIC_PCI_IOMAP
+1
arch/mips/Kconfig
··· 38 38 select GENERIC_CLOCKEVENTS 39 39 select GENERIC_CMOS_UPDATE 40 40 select HAVE_MOD_ARCH_SPECIFIC 41 + select HAVE_VIRT_TO_BUS 41 42 select MODULES_USE_ELF_REL if MODULES 42 43 select MODULES_USE_ELF_RELA if MODULES && 64BIT 43 44 select CLONE_BACKWARDS
+1
arch/mn10300/Kconfig
··· 8 8 select HAVE_ARCH_KGDB 9 9 select GENERIC_ATOMIC64 10 10 select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER 11 + select HAVE_VIRT_TO_BUS 11 12 select GENERIC_CLOCKEVENTS 12 13 select MODULES_USE_ELF_RELA 13 14 select OLD_SIGSUSPEND3
+1
arch/openrisc/Kconfig
··· 12 12 select ARCH_WANT_OPTIONAL_GPIOLIB 13 13 select HAVE_ARCH_TRACEHOOK 14 14 select HAVE_GENERIC_HARDIRQS 15 + select HAVE_VIRT_TO_BUS 15 16 select GENERIC_IRQ_CHIP 16 17 select GENERIC_IRQ_PROBE 17 18 select GENERIC_IRQ_SHOW
+1
arch/parisc/Kconfig
··· 19 19 select GENERIC_SMP_IDLE_THREAD 20 20 select GENERIC_STRNCPY_FROM_USER 21 21 select HAVE_MOD_ARCH_SPECIFIC 22 + select HAVE_VIRT_TO_BUS 22 23 select MODULES_USE_ELF_RELA 23 24 select CLONE_BACKWARDS 24 25 select TTY # Needed for pdc_cons.c
+1 -3
arch/powerpc/Kconfig
··· 87 87 help 88 88 Generic GPIO API support 89 89 90 - config ARCH_NO_VIRT_TO_BUS 91 - def_bool PPC64 92 - 93 90 config PPC 94 91 bool 95 92 default y ··· 98 101 select HAVE_FUNCTION_GRAPH_TRACER 99 102 select SYSCTL_EXCEPTION_TRACE 100 103 select ARCH_WANT_OPTIONAL_GPIOLIB 104 + select HAVE_VIRT_TO_BUS if !PPC64 101 105 select HAVE_IDE 102 106 select HAVE_IOREMAP_PROT 103 107 select HAVE_EFFICIENT_UNALIGNED_ACCESS
+1
arch/s390/Kconfig
··· 134 134 select HAVE_SYSCALL_WRAPPERS 135 135 select HAVE_UID16 if 32BIT 136 136 select HAVE_VIRT_CPU_ACCOUNTING 137 + select HAVE_VIRT_TO_BUS 137 138 select INIT_ALL_POSSIBLE 138 139 select KTIME_SCALAR if 32BIT 139 140 select MODULES_USE_ELF_RELA
+1
arch/score/Kconfig
··· 12 12 select GENERIC_CPU_DEVICES 13 13 select GENERIC_CLOCKEVENTS 14 14 select HAVE_MOD_ARCH_SPECIFIC 15 + select HAVE_VIRT_TO_BUS 15 16 select MODULES_USE_ELF_REL 16 17 select CLONE_BACKWARDS 17 18
-3
arch/sh/Kconfig
··· 148 148 config ARCH_HAS_ILOG2_U64 149 149 def_bool n 150 150 151 - config ARCH_NO_VIRT_TO_BUS 152 - def_bool y 153 - 154 151 config ARCH_HAS_DEFAULT_IDLE 155 152 def_bool y 156 153
-3
arch/sparc/Kconfig
··· 146 146 help 147 147 Generic GPIO API support 148 148 149 - config ARCH_NO_VIRT_TO_BUS 150 - def_bool y 151 - 152 149 config ARCH_SUPPORTS_DEBUG_PAGEALLOC 153 150 def_bool y if SPARC64 154 151
+1
arch/tile/Kconfig
··· 17 17 select GENERIC_IRQ_SHOW 18 18 select HAVE_DEBUG_BUGVERBOSE 19 19 select HAVE_SYSCALL_WRAPPERS if TILEGX 20 + select HAVE_VIRT_TO_BUS 20 21 select SYS_HYPERVISOR 21 22 select ARCH_HAVE_NMI_SAFE_CMPXCHG 22 23 select GENERIC_CLOCKEVENTS
+1
arch/unicore32/Kconfig
··· 9 9 select GENERIC_ATOMIC64 10 10 select HAVE_KERNEL_LZO 11 11 select HAVE_KERNEL_LZMA 12 + select HAVE_VIRT_TO_BUS 12 13 select ARCH_HAVE_CUSTOM_GPIO_H 13 14 select GENERIC_FIND_FIRST_BIT 14 15 select GENERIC_IRQ_PROBE
+1
arch/x86/Kconfig
··· 112 112 select GENERIC_STRNLEN_USER 113 113 select HAVE_CONTEXT_TRACKING if X86_64 114 114 select HAVE_IRQ_TIME_ACCOUNTING 115 + select HAVE_VIRT_TO_BUS 115 116 select MODULES_USE_ELF_REL if X86_32 116 117 select MODULES_USE_ELF_RELA if X86_64 117 118 select CLONE_BACKWARDS if X86_32
+1
arch/xtensa/Kconfig
··· 9 9 select HAVE_IDE 10 10 select GENERIC_ATOMIC64 11 11 select HAVE_GENERIC_HARDIRQS 12 + select HAVE_VIRT_TO_BUS 12 13 select GENERIC_IRQ_SHOW 13 14 select GENERIC_CPU_DEVICES 14 15 select MODULES_USE_ELF_RELA
+1 -1
mm/Kconfig
··· 287 287 288 288 config VIRT_TO_BUS 289 289 def_bool y 290 - depends on !ARCH_NO_VIRT_TO_BUS 290 + depends on HAVE_VIRT_TO_BUS 291 291 292 292 config MMU_NOTIFIER 293 293 bool