From patchwork Fri Jul 25 12:21:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 4622741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 42D349F36A for ; Fri, 25 Jul 2014 12:24:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 443E7201F4 for ; Fri, 25 Jul 2014 12:24:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCCA1201F2 for ; Fri, 25 Jul 2014 12:24:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XAeW2-0001O3-A8; Fri, 25 Jul 2014 12:22:26 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XAeVz-0001K2-HI for linux-arm-kernel@lists.infradead.org; Fri, 25 Jul 2014 12:22:24 +0000 Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XAeVY-0003yV-UQ; Fri, 25 Jul 2014 14:21:56 +0200 Received: from ukl by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1XAeVX-0000qJ-Hu; Fri, 25 Jul 2014 14:21:55 +0200 Date: Fri, 25 Jul 2014 14:21:55 +0200 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Russell King - ARM Linux Subject: Re: [PATCH v2 2/3] ARM: remove remaining definitions of PLAT_PHYS_OFFSET from Message-ID: <20140725122155.GD6146@pengutronix.de> References: <1404295043-6661-2-git-send-email-u.kleine-koenig@pengutronix.de> <1404717185-10010-1-git-send-email-u.kleine-koenig@pengutronix.de> <20140725000621.GO21766@n2100.arm.linux.org.uk> <20140725090912.GC6146@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140725090912.GC6146@pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:5054:ff:fec0:8e10 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140725_052223_884088_B574D9C6 X-CRM114-Status: GOOD ( 24.10 ) X-Spam-Score: -0.0 (/) Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hello Russell, On Fri, Jul 25, 2014 at 11:09:12AM +0200, Uwe Kleine-König wrote: > On Fri, Jul 25, 2014 at 01:06:22AM +0100, Russell King - ARM Linux wrote: > > On Mon, Jul 07, 2014 at 09:13:05AM +0200, Uwe Kleine-König wrote: > > > The platforms selecting NEED_MACH_MEMORY_H defined the start address of > > > their physical memory in the respective . With > > > ARM_PATCH_PHYS_VIRT=y (which is quite common today) this is useless > > > though because the definition isn't used but determined dynamically. > > > > > > So remove the definitions from all and provide the > > > Kconfig symbol PHYS_OFFSET with the respective defaults in case > > > ARM_PATCH_PHYS_VIRT isn't enabled. > > > > > > This allows to drop the dependency of PHYS_OFFSET on !NEED_MACH_MEMORY_H > > > which prevents compiling an integrator nommu-kernel. > > > (CONFIG_PAGE_OFFSET which has "default PHYS_OFFSET if !MMU" expanded to > > > "0x" because CONFIG_PHYS_OFFSET doesn't exist as INTEGRATOR selects > > > NEED_MACH_MEMORY_H.) > > > > Should I assume that this hasn't been build tested? > darn, I admit being guilty not retesting it after rebasing to 3.16-rc. I > think I did test it when I wrote the patch the first time, but you made > me unsure if I tested all relevant cases. Working on a follow-up patch. The following patch fixes all defconfigs: PLAT_PHYS_OFFSET then still has this strange value on builds with ARM_PATCH_PHYS_VIRT=y, but this doesn't matter as the value is unused then. Do you squash this into the faulty patch or should I follow up with a proper patch to repair the mess? Sorry again Uwe diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index eb69feb3b804..23e7a313f75d 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h @@ -20,6 +20,8 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H +#ifdef CONFIG_SPARSEMEM + /* * Sparsemem definitions for RealView PBX. *