Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751540AbdGYR2s (ORCPT ); Tue, 25 Jul 2017 13:28:48 -0400 Received: from smtp04.smtpout.orange.fr ([80.12.242.126]:50479 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbdGYR2r (ORCPT ); Tue, 25 Jul 2017 13:28:47 -0400 X-ME-Helo: belgarion X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Tue, 25 Jul 2017 19:28:45 +0200 X-ME-IP: 90.16.81.74 From: Robert Jarzmik To: Arnd Bergmann Cc: Daniel Mack , Haojian Zhuang , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] ARM: sa1100/pxa: fix MTD_XIP build References: <20170725152616.4143857-1-arnd@arndb.de> X-URL: http://belgarath.falguerolles.org/ Date: Tue, 25 Jul 2017 19:28:42 +0200 In-Reply-To: <20170725152616.4143857-1-arnd@arndb.de> (Arnd Bergmann's message of "Tue, 25 Jul 2017 17:25:47 +0200") Message-ID: <87shhkqvcl.fsf@belgarion.home> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1065 Lines: 28 Arnd Bergmann writes: > In commit 3169663ac5902 "ARM: sa11x0/pxa: convert OS timer registers > to IOMEM", the definition of the OSCR macro was changed to be an > __iomem pointer, but the same register is also used by the XIP > code. This patch does the corresponding change here as well. > > On PXA, the IRQ register definitions were removed even earlier, in > commit 5d284e353eb1 ("ARM: pxa: avoid accessing interrupt registers > directly"). This patch unfortunately brings some of that back. An > earlier version of my patch moved the code into an external function, > which could not work for CONFIG_XIP_KERNEL+CONFIG_MTD_XIP, so this > restores something close to the original code. > > Link: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/241716.html > Signed-off-by: Arnd Bergmann > Cc: Russell King > Cc: Robert Jarzmik > --- > > v2: add back outer () as Robert suggested For mach-pxa : Acked-by: Robert Jarzmik Cheers. -- Robert