From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack
Date: Wed, 14 Oct 2015 21:05:43 +0200 [thread overview]
Message-ID: <8737xd46ew.fsf@belgarion.home> (raw)
In-Reply-To: <5765189.ly9CxV2CMz@wuerfel> (Arnd Bergmann's message of "Wed, 14 Oct 2015 17:14:17 +0200")
Arnd Bergmann <arnd@arndb.de> writes:
> On Monday 12 October 2015 19:03:44 Robert Jarzmik wrote:
>> Arnd Bergmann <arnd@arndb.de> 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 <arnd@arndb.de>
>> > 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 <robert.jarzmik@free.fr>
>>
>> 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
Thanks.
Cheers.
--
Robert
prev parent reply other threads:[~2015-10-14 19:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 13:44 [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Arnd Bergmann
2015-10-12 13:46 ` [PATCH] pxa: remove incorrect __init annotation on pxa27x_set_pwrmode Arnd Bergmann
2015-10-12 17:10 ` Robert Jarzmik
2015-10-12 18:53 ` Robert Jarzmik
2015-10-12 19:20 ` Arnd Bergmann
2015-10-12 21:07 ` Robert Jarzmik
2015-10-13 7:57 ` Arnd Bergmann
2015-10-12 18:57 ` Arnd Bergmann
2015-10-12 17:03 ` [PATCH] ARM: pxa: fix pxa3xx DFI lockup hack Robert Jarzmik
2015-10-12 18:57 ` Arnd Bergmann
2015-10-14 15:14 ` Arnd Bergmann
2015-10-14 19:05 ` Robert Jarzmik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8737xd46ew.fsf@belgarion.home \
--to=robert.jarzmik@free.fr \
--cc=arnd@arndb.de \
--cc=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox