From patchwork Wed Feb 20 16:00:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2168351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3DF98DF230 for ; Wed, 20 Feb 2013 16:05:42 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U8C6g-0006ly-98; Wed, 20 Feb 2013 16:01:18 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U8C6d-0006la-TY for linux-arm-kernel@lists.infradead.org; Wed, 20 Feb 2013 16:01:16 +0000 Received: from klappe2.localnet (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lf0KF-1Uejoz1j8Z-00qUUV; Wed, 20 Feb 2013 17:00:50 +0100 From: Arnd Bergmann To: James Hogan , Andrew Morton Subject: Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere Date: Wed, 20 Feb 2013 16:00:47 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-6-generic; KDE/4.3.2; x86_64; ; ) References: <1360849767-1463135-1-git-send-email-arnd@arndb.de> <1360849767-1463135-2-git-send-email-arnd@arndb.de> In-Reply-To: MIME-Version: 1.0 Message-Id: <201302201600.47522.arnd@arndb.de> X-Provags-ID: V02:K0:e7zmS6TT/6ElWBnWoSonHbgR5U58yEIjZM+CfaEVqJj MpEBnlAPvZelrX6Md83OPc7O6+usexAGJM2/rjiSU3Y9fSQiht /tMAbL53PakMEIp5vuZp9OVi7rFs5T0HPWrdtdUNU8OXD1fq4J fVFMcf6U01BJdWpJMa2dvzr+bEYEjnc0EeBOdP9I902uDwWXe9 6nx+Aj1yb8jv09Lu00ZX3eLSbmWYnsnE9oDUuVsdJwQT+2wou7 alv9IYhRrkE3fV3umz+BHigb5BCjlRxP6c0Zw96wcuLy1PepxX NqMuL6qWvWWeG+bPTkSV3M9Ct3J5rmgb32YOkYtGw98/6QiDBc 89sCpa2LCW1Viba+nB2U= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130220_110116_162391_A83EE761 X-CRM114-Status: GOOD ( 15.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Stephen Rothwell , Russell King , arm@kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wednesday 20 February 2013, James Hogan wrote: > There's a patch in linux-next by Stephen Rothwell "Centralise > CONFIG_ARCH_NO_VIRT_TO_BUS" that removes this Kconfig symbol, > inverting/replacing it with "select HAVE_VIRT_TO_BUS" (including for > arch/arm) which will undo the effects of this. Ah, thanks for pointing that out. At least my patch is harmless then although also useless. I'll leave it in for now so I don't have to rebase all the other bug fixes that are queued for 3.9, but I'm making a note that I'll have to replace this with a proper one. I also don't think that anything breaks if we apply both patches for a while, it will just make my patch useless. I guess you'll have to do something similar for arch/metag, and Vineet will do it for arch/arc. Stephen's patch is currently in Andrew's tree, and I don't see an easy way to coordinate this. The patch we will need once both are merged is below. Signed-off-by: Arnd Bergmann Acked-by: James Hogan (for arch/metag) Acked-by: Vineet Gupta (for arch/arc) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 4fef29f..5829b67 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -76,9 +76,6 @@ config HAVE_LATENCYTOP_SUPPORT config NO_DMA def_bool n -config ARCH_NO_VIRT_TO_BUS - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dedf02b..7b35b39 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -49,7 +49,6 @@ 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 @@ -744,6 +743,7 @@ config ARCH_RPC select NEED_MACH_IO_H select NEED_MACH_MEMORY_H select NO_IOPORT + select HAVE_VIRT_TO_BUS help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive. @@ -880,6 +880,7 @@ config ARCH_SHARK select NEED_MACH_MEMORY_H select PCI select ZONE_DMA + select HAVE_VIRT_TO_BUS help Support for the StrongARM based Digital DNARD machine, also known as "Shark" (). @@ -1462,10 +1463,6 @@ config ISA_DMA bool select ISA_DMA_API -config ARCH_NO_VIRT_TO_BUS - def_bool y - depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK - # Select ISA DMA interface config ISA_DMA_API bool diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index abda5a1..42bf587 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -67,6 +67,7 @@ config ARCH_NETWINDER select ISA select ISA_DMA select PCI + select HAVE_VIRT_TO_BUS help Say Y here if you intend to run this kernel on the Rebel.COM NetWinder. Information about this machine can be found at: diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index 30adc78..03e216e 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig @@ -35,9 +35,6 @@ config METAG select OF_EARLY_FLATTREE select SPARSE_IRQ -config ARCH_NO_VIRT_TO_BUS - def_bool y - config STACKTRACE_SUPPORT def_bool y