From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756543Ab3CMQn7 (ORCPT ); Wed, 13 Mar 2013 12:43:59 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:50754 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755471Ab3CMQn5 (ORCPT ); Wed, 13 Mar 2013 12:43:57 -0400 From: Arnd Bergmann To: "linux-arm-kernel@lists.infradead.org" , Stephen Rothwell Subject: [PATCH] ARM: fix CONFIG_VIRT_TO_BUS handling Date: Wed, 13 Mar 2013 16:43:48 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-8-generic; KDE/4.3.2; x86_64; ; ) Cc: "linux-kernel@vger.kernel.org" , "Russell King - ARM Linux" MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201303131643.48506.arnd@arndb.de> X-Provags-ID: V02:K0:9hI7nWK+fV2UGyWhELfOhuzcAkF8LC54mUGtmcoxgHx 48UCPFGVt9krvRquvc+LYnNXveXAz/MUqG43l8FUBovVfdxS2k GyOrq1/Qzp8Nu8C9nVsfBXCKpzjjYZ/dJC0IofH8tVIcsrR823 Co4sAtuPtMPxE/65btILnqWz+IcOUJMv4KdB6ZhWfwRKSmGJfK XZDWoOT9sQ64ZI9HHlM5QDOzLTUDok7wkU11Gv+/grTAfqMeYB RsvkqOL5SwcpO0SeJBHvegLrHrhKVDIUEajJ+y7d3KQ5tJY6OR VxuvRtjkl3WjGjXspINWcx+/UyhLLQQw9yMGfYHfZbn7t7LQnY 83ovva5l8o6KI/Gin6T4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 887cbce0 "arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS" and 4febd95a8 "Select VIRT_TO_BUS directly where needed" from Stephen Rothwell changed globally how CONFIG_VIRT_TO_BUS is selected, while my own a5d533ee0 "ARM: disable virt_to_bus/ virt_to_bus almost everywhere" was merged at the same time and changed which platforms select it on ARM. The result of this conflict was that we again see CONFIG_VIRT_TO_BUS on all ARM systems. This patch fixes up the problem and removes CONFIG_ARCH_NO_VIRT_TO_BUS again on ARM. Signed-off-by: Arnd Bergmann Cc: Russell King Cc: Stephen Rothwell --- I'd like to merge this one through the arm-soc tree as a 3.9 bug fix unless there are objections. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 78ffcc6..ad52cd4 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 @@ -733,6 +732,7 @@ config ARCH_RPC select NEED_MACH_IO_H select NEED_MACH_MEMORY_H select NO_IOPORT + select 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. @@ -868,6 +868,7 @@ config ARCH_SHARK select ISA_DMA select NEED_MACH_MEMORY_H select PCI + select VIRT_TO_BUS select ZONE_DMA help Support for the StrongARM based Digital DNARD machine, also known @@ -1451,10 +1452,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..0f2111a 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 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: