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

Select VIRT_TO_BUS directly where needed

In commit 887cbce0adea ("arch Kconfig: centralise ARCH_NO_VIRT_TO_BUS")
I introduced the config sybmol HAVE_VIRT_TO_BUS and selected that where
needed. I am not sure what I was thinking. Instead, just directly
select VIRT_TO_BUS where it is needed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Stephen Rothwell and committed by
Linus Torvalds 4febd95a 8aec0f5d

+28 -31
-7
arch/Kconfig
··· 319 319 select ARCH_WANT_COMPAT_IPC_PARSE_VERSION 320 320 bool 321 321 322 - config HAVE_VIRT_TO_BUS 323 - bool 324 - help 325 - An architecture should select this if it implements the 326 - deprecated interface virt_to_bus(). All new architectures 327 - should probably not select this. 328 - 329 322 config HAVE_ARCH_SECCOMP_FILTER 330 323 bool 331 324 help
+1 -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 + select VIRT_TO_BUS 13 13 select GENERIC_IRQ_PROBE 14 14 select AUTO_IRQ_AFFINITY if SMP 15 15 select GENERIC_IRQ_SHOW
+1 -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 + select VIRT_TO_BUS 53 53 select KTIME_SCALAR 54 54 select PERF_USE_VMALLOC 55 55 select RTC_LIB
+1 -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 + select VIRT_TO_BUS 11 11 select GENERIC_IRQ_PROBE 12 12 select GENERIC_ATOMIC64 13 13 select HARDIRQS_SW_RESEND
+1 -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 + select VIRT_TO_BUS 37 37 select ARCH_WANT_IPC_PARSE_VERSION 38 38 select HAVE_GENERIC_HARDIRQS 39 39 select GENERIC_ATOMIC64
+1 -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 + select VIRT_TO_BUS 47 47 select ARCH_WANT_IPC_PARSE_VERSION 48 48 select GENERIC_IRQ_SHOW 49 49 select GENERIC_IOMAP
+1 -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 + select VIRT_TO_BUS 10 10 select GENERIC_IRQ_SHOW 11 11 select HAVE_DEBUG_BUGVERBOSE 12 12 select ARCH_HAVE_NMI_SAFE_CMPXCHG
+1 -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 + select VIRT_TO_BUS 9 9 select ARCH_WANT_IPC_PARSE_VERSION 10 10 select GENERIC_IRQ_SHOW 11 11 select GENERIC_CPU_DEVICES
+1 -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 + select VIRT_TO_BUS 30 30 select ARCH_DISCARD_MEMBLOCK 31 31 select GENERIC_IRQ_PROBE 32 32 select GENERIC_PENDING_IRQ if SMP
+1 -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 + select VIRT_TO_BUS 14 14 select GENERIC_IRQ_PROBE 15 15 select GENERIC_IRQ_SHOW 16 16 select GENERIC_ATOMIC64
+1 -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 + select VIRT_TO_BUS 12 12 select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS 13 13 select GENERIC_CPU_DEVICES 14 14 select GENERIC_STRNCPY_FROM_USER if MMU
+1 -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 + select VIRT_TO_BUS 23 23 select GENERIC_IRQ_PROBE 24 24 select GENERIC_IRQ_SHOW 25 25 select GENERIC_PCI_IOMAP
+1 -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 + select VIRT_TO_BUS 42 42 select MODULES_USE_ELF_REL if MODULES 43 43 select MODULES_USE_ELF_RELA if MODULES && 64BIT 44 44 select CLONE_BACKWARDS
+1 -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 + select VIRT_TO_BUS 12 12 select GENERIC_CLOCKEVENTS 13 13 select MODULES_USE_ELF_RELA 14 14 select OLD_SIGSUSPEND3
+1 -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 + select VIRT_TO_BUS 16 16 select GENERIC_IRQ_CHIP 17 17 select GENERIC_IRQ_PROBE 18 18 select GENERIC_IRQ_SHOW
+1 -1
arch/parisc/Kconfig
··· 21 21 select GENERIC_STRNCPY_FROM_USER 22 22 select SYSCTL_ARCH_UNALIGN_ALLOW 23 23 select HAVE_MOD_ARCH_SPECIFIC 24 - select HAVE_VIRT_TO_BUS 24 + select VIRT_TO_BUS 25 25 select MODULES_USE_ELF_RELA 26 26 select CLONE_BACKWARDS 27 27 select TTY # Needed for pdc_cons.c
+1 -1
arch/powerpc/Kconfig
··· 98 98 select HAVE_FUNCTION_GRAPH_TRACER 99 99 select SYSCTL_EXCEPTION_TRACE 100 100 select ARCH_WANT_OPTIONAL_GPIOLIB 101 - select HAVE_VIRT_TO_BUS if !PPC64 101 + select VIRT_TO_BUS if !PPC64 102 102 select HAVE_IDE 103 103 select HAVE_IOREMAP_PROT 104 104 select HAVE_EFFICIENT_UNALIGNED_ACCESS
+1 -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 + select VIRT_TO_BUS 138 138 select INIT_ALL_POSSIBLE 139 139 select KTIME_SCALAR if 32BIT 140 140 select MODULES_USE_ELF_RELA
+1 -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 + select VIRT_TO_BUS 16 16 select MODULES_USE_ELF_REL 17 17 select CLONE_BACKWARDS 18 18
+1 -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 + select VIRT_TO_BUS 21 21 select SYS_HYPERVISOR 22 22 select ARCH_HAVE_NMI_SAFE_CMPXCHG 23 23 select GENERIC_CLOCKEVENTS
+1 -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 + select VIRT_TO_BUS 13 13 select ARCH_HAVE_CUSTOM_GPIO_H 14 14 select GENERIC_FIND_FIRST_BIT 15 15 select GENERIC_IRQ_PROBE
+1 -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 + select VIRT_TO_BUS 116 116 select MODULES_USE_ELF_REL if X86_32 117 117 select MODULES_USE_ELF_RELA if X86_64 118 118 select CLONE_BACKWARDS if X86_32
+1 -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 + select VIRT_TO_BUS 13 13 select GENERIC_IRQ_SHOW 14 14 select GENERIC_CPU_DEVICES 15 15 select MODULES_USE_ELF_RELA
+6 -2
mm/Kconfig
··· 286 286 default "1" 287 287 288 288 config VIRT_TO_BUS 289 - def_bool y 290 - depends on HAVE_VIRT_TO_BUS 289 + bool 290 + help 291 + An architecture should select this if it implements the 292 + deprecated interface virt_to_bus(). All new architectures 293 + should probably not select this. 294 + 291 295 292 296 config MMU_NOTIFIER 293 297 bool