forked from mirrors/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>
This commit is contained in:
		
							parent
							
								
									31b4ca3ef9
								
							
						
					
					
						commit
						887cbce0ad
					
				
					 26 changed files with 30 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -303,6 +303,13 @@ config ARCH_WANT_OLD_COMPAT_IPC
 | 
			
		|||
	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
 | 
			
		||||
	bool
 | 
			
		||||
 | 
			
		||||
config HAVE_VIRT_TO_BUS
 | 
			
		||||
	bool
 | 
			
		||||
	help
 | 
			
		||||
	  An architecture should select this if it implements the
 | 
			
		||||
	  deprecated interface virt_to_bus().  All new architectures
 | 
			
		||||
	  should probably not select this.
 | 
			
		||||
 | 
			
		||||
config HAVE_ARCH_SECCOMP_FILTER
 | 
			
		||||
	bool
 | 
			
		||||
	help
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,6 +9,7 @@ config ALPHA
 | 
			
		|||
	select HAVE_PERF_EVENTS
 | 
			
		||||
	select HAVE_DMA_ATTRS
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select AUTO_IRQ_AFFINITY if SMP
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -49,6 +49,7 @@ config ARM
 | 
			
		|||
	select HAVE_REGS_AND_STACK_ACCESS_API
 | 
			
		||||
	select HAVE_SYSCALL_TRACEPOINTS
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select KTIME_SCALAR
 | 
			
		||||
	select PERF_USE_VMALLOC
 | 
			
		||||
	select RTC_LIB
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,6 +7,7 @@ config AVR32
 | 
			
		|||
	select HAVE_OPROFILE
 | 
			
		||||
	select HAVE_KPROBES
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HARDIRQS_SW_RESEND
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -33,6 +33,7 @@ config BLACKFIN
 | 
			
		|||
	select ARCH_HAVE_CUSTOM_GPIO_H
 | 
			
		||||
	select ARCH_WANT_OPTIONAL_GPIOLIB
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_WANT_IPC_PARSE_VERSION
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -43,6 +43,7 @@ config CRIS
 | 
			
		|||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_WANT_IPC_PARSE_VERSION
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_IOMAP
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,6 +6,7 @@ config FRV
 | 
			
		|||
	select HAVE_PERF_EVENTS
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select HAVE_DEBUG_BUGVERBOSE
 | 
			
		||||
	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,6 +5,7 @@ config H8300
 | 
			
		|||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_WANT_IPC_PARSE_VERSION
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_CPU_DEVICES
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,6 +26,7 @@ config IA64
 | 
			
		|||
	select HAVE_MEMBLOCK
 | 
			
		||||
	select HAVE_MEMBLOCK_NODE_MAP
 | 
			
		||||
	select HAVE_VIRT_CPU_ACCOUNTING
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_DISCARD_MEMBLOCK
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select GENERIC_PENDING_IRQ if SMP
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,6 +10,7 @@ config M32R
 | 
			
		|||
	select ARCH_WANT_IPC_PARSE_VERSION
 | 
			
		||||
	select HAVE_DEBUG_BUGVERBOSE
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,7 @@ config M68K
 | 
			
		|||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_UID16
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
 | 
			
		||||
	select GENERIC_CPU_DEVICES
 | 
			
		||||
	select GENERIC_STRNCPY_FROM_USER if MMU
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,6 +19,7 @@ config MICROBLAZE
 | 
			
		|||
	select HAVE_DEBUG_KMEMLEAK
 | 
			
		||||
	select IRQ_DOMAIN
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_PCI_IOMAP
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,6 +38,7 @@ config MIPS
 | 
			
		|||
	select GENERIC_CLOCKEVENTS
 | 
			
		||||
	select GENERIC_CMOS_UPDATE
 | 
			
		||||
	select HAVE_MOD_ARCH_SPECIFIC
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select MODULES_USE_ELF_REL if MODULES
 | 
			
		||||
	select MODULES_USE_ELF_RELA if MODULES && 64BIT
 | 
			
		||||
	select CLONE_BACKWARDS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,6 +8,7 @@ config MN10300
 | 
			
		|||
	select HAVE_ARCH_KGDB
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_CLOCKEVENTS
 | 
			
		||||
	select MODULES_USE_ELF_RELA
 | 
			
		||||
	select OLD_SIGSUSPEND3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,6 +12,7 @@ config OPENRISC
 | 
			
		|||
	select ARCH_WANT_OPTIONAL_GPIOLIB
 | 
			
		||||
        select HAVE_ARCH_TRACEHOOK
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_CHIP
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,6 +19,7 @@ config PARISC
 | 
			
		|||
	select GENERIC_SMP_IDLE_THREAD
 | 
			
		||||
	select GENERIC_STRNCPY_FROM_USER
 | 
			
		||||
	select HAVE_MOD_ARCH_SPECIFIC
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select MODULES_USE_ELF_RELA
 | 
			
		||||
	select CLONE_BACKWARDS
 | 
			
		||||
	select TTY # Needed for pdc_cons.c
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 HAVE_VIRT_TO_BUS if !PPC64
 | 
			
		||||
	select HAVE_IDE
 | 
			
		||||
	select HAVE_IOREMAP_PROT
 | 
			
		||||
	select HAVE_EFFICIENT_UNALIGNED_ACCESS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -134,6 +134,7 @@ config S390
 | 
			
		|||
	select HAVE_SYSCALL_WRAPPERS
 | 
			
		||||
	select HAVE_UID16 if 32BIT
 | 
			
		||||
	select HAVE_VIRT_CPU_ACCOUNTING
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select INIT_ALL_POSSIBLE
 | 
			
		||||
	select KTIME_SCALAR if 32BIT
 | 
			
		||||
	select MODULES_USE_ELF_RELA
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,6 +12,7 @@ config SCORE
 | 
			
		|||
       select GENERIC_CPU_DEVICES
 | 
			
		||||
       select GENERIC_CLOCKEVENTS
 | 
			
		||||
       select HAVE_MOD_ARCH_SPECIFIC
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select MODULES_USE_ELF_REL
 | 
			
		||||
	select CLONE_BACKWARDS
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -148,9 +148,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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -146,9 +146,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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,6 +17,7 @@ config TILE
 | 
			
		|||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select HAVE_DEBUG_BUGVERBOSE
 | 
			
		||||
	select HAVE_SYSCALL_WRAPPERS if TILEGX
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select SYS_HYPERVISOR
 | 
			
		||||
	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 | 
			
		||||
	select GENERIC_CLOCKEVENTS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,6 +9,7 @@ config UNICORE32
 | 
			
		|||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_KERNEL_LZO
 | 
			
		||||
	select HAVE_KERNEL_LZMA
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select ARCH_HAVE_CUSTOM_GPIO_H
 | 
			
		||||
	select GENERIC_FIND_FIRST_BIT
 | 
			
		||||
	select GENERIC_IRQ_PROBE
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -112,6 +112,7 @@ config X86
 | 
			
		|||
	select GENERIC_STRNLEN_USER
 | 
			
		||||
	select HAVE_CONTEXT_TRACKING if X86_64
 | 
			
		||||
	select HAVE_IRQ_TIME_ACCOUNTING
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select MODULES_USE_ELF_REL if X86_32
 | 
			
		||||
	select MODULES_USE_ELF_RELA if X86_64
 | 
			
		||||
	select CLONE_BACKWARDS if X86_32
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,6 +9,7 @@ config XTENSA
 | 
			
		|||
	select HAVE_IDE
 | 
			
		||||
	select GENERIC_ATOMIC64
 | 
			
		||||
	select HAVE_GENERIC_HARDIRQS
 | 
			
		||||
	select HAVE_VIRT_TO_BUS
 | 
			
		||||
	select GENERIC_IRQ_SHOW
 | 
			
		||||
	select GENERIC_CPU_DEVICES
 | 
			
		||||
	select MODULES_USE_ELF_RELA
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -287,7 +287,7 @@ config NR_QUICK
 | 
			
		|||
 | 
			
		||||
config VIRT_TO_BUS
 | 
			
		||||
	def_bool y
 | 
			
		||||
	depends on !ARCH_NO_VIRT_TO_BUS
 | 
			
		||||
	depends on HAVE_VIRT_TO_BUS
 | 
			
		||||
 | 
			
		||||
config MMU_NOTIFIER
 | 
			
		||||
	bool
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue