From patchwork Mon Nov 12 21:26:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1730761 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9603F3FCDE for ; Mon, 12 Nov 2012 21:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754220Ab2KLV0a (ORCPT ); Mon, 12 Nov 2012 16:26:30 -0500 Received: from haggis.pcug.org.au ([203.10.76.10]:59611 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754159Ab2KLV02 (ORCPT ); Mon, 12 Nov 2012 16:26:28 -0500 Received: from canb.auug.org.au (ash.rothwell.emu.id.au [IPv6:2402:b800:7003:7010:223:14ff:fe30:c8e4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id B2E161640E4; Tue, 13 Nov 2012 08:26:21 +1100 (EST) Date: Tue, 13 Nov 2012 08:26:15 +1100 From: Stephen Rothwell To: Andrew Morton Cc: Bjorn Helgaas , H Hartley Sweeten , , Benjamin Herrenschmidt , Paul Mackerras , , "David S. Miller" , , , Paul Mundt , Subject: [PATCH] Centralise CONFIG_ARCH_NO_VIRT_TO_BUS Message-Id: <20121113082615.2f482eb8835daf46e1f27947@canb.auug.org.au> In-Reply-To: References: X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Make if easier for more architectures to select it and thus disable drivers that use virt_to_bus(). Signed-off-by: Stephen Rothwell Acked-by: David S. Miller Reviewed-by: James Hogan Acked-by: Arnd Bergmann --- arch/Kconfig | 7 +++++++ arch/powerpc/Kconfig | 4 +--- arch/sh/Kconfig | 4 +--- arch/sparc/Kconfig | 4 +--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 366ec06..9bc00e7 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 a902a5c..8c8fcba 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 babc2b8..9b28793 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -16,6 +16,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 @@ -150,9 +151,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 9f2edb5..594d9bc 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_IRQ_WORK @@ -143,9 +144,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