From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932574AbbJNPOW (ORCPT ); Wed, 14 Oct 2015 11:14:22 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:51416 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbbJNPOU (ORCPT ); Wed, 14 Oct 2015 11:14:20 -0400 From: Arnd Bergmann To: Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, Daniel Mack , Haojian Zhuang , linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Date: Wed, 14 Oct 2015 17:14:17 +0200 Message-ID: <5765189.ly9CxV2CMz@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <878u786mtr.fsf@belgarion.home> References: <5287252.pkh9x0t1Y6@wuerfel> <878u786mtr.fsf@belgarion.home> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:0+XIIRgNbpv1EXG0rk67/brZy1wKQPdPaxUrhR27IIRbHZXGu17 WDqfnlbMpvTrftrp7jrVqgkVdX7mfmTePDywLovj3aVO4EfMiv3+maiw2/RvvVLKfaT/p7c yBkNCFFr05mGFIuD2+LS2017jiOzYz1+O2SKU1w60Md9FZQiK3qTOUzwQsASxMzFX8fXst/ wt1gz9b/kH6XbB1Zk3nkw== X-UI-Out-Filterresults: notjunk:1;V01:K0:uFUivnZHCnY=:W9ko0GzwEwnw+eIgq/6BBk jJOdom4KmlwDC85ARVtdRScsd/vfg1Zwk0sNlNiktcTmKLW+9rg0MngRLSA+HocNhXOo73Mz5 /w5Seny4PXb6r+Xi5ntc3eGXKiXxIFyJ8hgLHtYU99JTcm6oe33Hw9iF9kX1KWwx5vUAyE8gc TwVNk7NbqJG4P0xzMEngoE8ugVPC0JMvvZBtMUMeY9YsTMpBCCvkWdIFMg6c3wgZp4rJkzjG9 MRC7yqLtkyN4iC+ZSi2+zTWtrPLKW7w0jEWzdIsB14aKyMTxJyjUBaHWJ+rrUHZyauW0gXN7x nJq3zPP8U2jcwtkrPsxXWLkDUUVXJ+qbC43oH/szrQ/4X2JiojmvIuCneF+kAPvtHDl4hwSOx o1287H/WqoPcYhJVpNOGI6GZxJ6CuEPMrZ000wCmE4ZDRsdKv6qzeMKErv9ZO8IxN2fpdPc8c kpXv9PCX3Fs1tMu79zK6DO2w9MOiEpws4/ZVNQTJnkFJDYWcS25wcFGeQbZxiE3UuXrArn28I BvaqSM6ldJ4Y8lgXep+u85sSLi1AB9ISI/WImzqZuAOd0vJ5xKjd6+YYlQHXSDKC9UwF6/vdv h74WV7X4ho34MGIyNM2Pii75wfzsH+OlPuXL3JpHXFdh/KSfszR7Dk1DV2NmXYgfKGWEP5OOh FJebr9g9TU0V6ydu8EsQaumodFvuVa3cA+Aw+U0Y2PqlUm9oqPJESTTtyxbHMENABFFWe3fNP +QTJ4DbBFPQVvDHF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday 12 October 2015 19:03:44 Robert Jarzmik wrote: > Arnd Bergmann writes: > > > Some recently added code to avoid a bug introduced a build error > > when CONFIG_PM is disabled and a macro is hidden: > > > > arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_init': > > arch/arm/mach-pxa/pxa3xx.c:439:3: error: 'NDCR' undeclared (first use in this function) > > NDCR = (NDCR & ~NDCR_ND_ARB_EN) | NDCR_ND_ARB_CNTL; > > ^ > > > > This moves the macro outside of the #ifdef so it can be > > referenced correctly. > > > > Signed-off-by: Arnd Bergmann > > Fixes: adf3442cc890 ("ARM: pxa: fix DFI bus lockups on startup") > > --- > > We merged the patch that introduced this as a fix for 4.3, so we should > > probably add this one too. > Oh yes, didn't see that ifdef, and all my non-regression defconfigs have > CONFIG_PM ... > > Acked-by: Robert Jarzmik > > So do you want to take it directly (my preferred solution) or do you want a > proper pull request for in the -rc5 timeframe ? Applied now. Arnd