From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbbJLS6P (ORCPT ); Mon, 12 Oct 2015 14:58:15 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:64683 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751081AbbJLS6N (ORCPT ); Mon, 12 Oct 2015 14:58:13 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Robert Jarzmik , Haojian Zhuang , Daniel Mack , linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Date: Mon, 12 Oct 2015 20:57:35 +0200 Message-ID: <6588446.F7ggU3HDOr@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:Im0Y6SYzecv093lvJRKDCk+ZyqYA/58MFNcWl0n4yfS3t1RoOVC g956oV3r5jlEWtP0HZlOgqnFXJPUxpwdqwW/JzmS71pXLmZ1ZNbsQfFdqTb3UNmy+B/gfSH UetDDxpFaloszZ0o8dTY3ex6PtxZrdxcWEuZnW9qEzoq8+uMmEIljKBsRnikjcnHu22VlXM zbvM4PjgLM6DTMtogK5lQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:oLHjzrLGZTU=:MaiMZdX7aKVhO2BfhyxhN/ Nlu6XnNSam+sCQlLPbLQgbW0WoAXdixHHmklGcUEgVPoPLZ9mxv2RmrKqojpM76F+Twf2jOBy eEq5uZosE/CStv59YP848TTOFXhdxca7TYEdqaivFuJ3KD9OJr1mzOtPe+1pmBXw8cB1s7/3M RIqGRjCtIbWolLti7y66Or6FI6prlwT9USFRdg7kE9GNlO0Oky+KTvUDVICsQB7pQ6cW/L2Vl 5qXm0qtj/5e+8gzi/icuNlsEzxfymX6u9TlU4s2iZTD/zu2C7C8yjbjecN/wRgkYBgThjeuoT WKOOxFAvU9g2vnrJA2hkj21lbe6E/57L+cYqSuwtl9PgrOtwLMI3y+44mV6/MtVrSbjuVaJHz TJrLcTJsGUCrkCfQL5l2XOknTU1qii/vBzpfBfGS+5p+LOhIiBQlrTXFcZNtovfFgY3TbaLe1 6kryDP/WKKqj5IhXyaN9Ax30Fe+qm7Hs5c5ls23dtqWoYXH2aLTLQ6/Qfa06rn1d818E2RQjL ZFahiep+fW6ryGocGkrTs27hC6aK2mdrwtOto1v6hVmYo6w/LCo3oWJeof2lEgizdFCjgUa59 5CbVyFyNhDdE72tjxZb2wB3kG3/plBusQKXQXv9xDXYmcalsVRqmsPPtRhqgPEw3pcvvD/gBr o8JCMlsvHFGW4diHoThOGxW75diIhsYgRML0rX8qp/Ejk/OdpBB51QKuU5e/G2cB/6eoPJA5A tcAlVJTp5yJiMj5y 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 ? > I've put it into my todo list, will apply it tomorrow. Arnd