From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751642AbbJLRJV (ORCPT ); Mon, 12 Oct 2015 13:09:21 -0400 Received: from smtp07.smtpout.orange.fr ([80.12.242.129]:52396 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751526AbbJLRJS (ORCPT ); Mon, 12 Oct 2015 13:09:18 -0400 X-ME-Helo: belgarion X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Mon, 12 Oct 2015 19:09:16 +0200 X-ME-IP: 90.16.80.96 From: Robert Jarzmik To: Arnd Bergmann 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 References: <5287252.pkh9x0t1Y6@wuerfel> X-URL: http://belgarath.falguerolles.org/ Date: Mon, 12 Oct 2015 19:03:44 +0200 In-Reply-To: <5287252.pkh9x0t1Y6@wuerfel> (Arnd Bergmann's message of "Mon, 12 Oct 2015 15:44:49 +0200") Message-ID: <878u786mtr.fsf@belgarion.home> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.4 (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 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 ? Cheers. -- Robert