From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-kernel Mailing List <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Paul Mackerras <paulus@samba.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>, Willy Tarreau <w@1wt.eu>
Subject: Re: powerpc: build failures in Linus' tree
Date: Tue, 04 Aug 2020 10:49:20 +1000 [thread overview]
Message-ID: <87pn87z14f.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <20200803223147.28adac79@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> On Mon, 03 Aug 2020 21:18:00 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> If we just move the include of asm/paca.h below asm-generic/percpu.h
>> then it avoids the bad circular dependency and we still have paca.h
>> included from percpu.h as before.
>>
>> eg:
>>
>> diff --git a/arch/powerpc/include/asm/percpu.h b/arch/powerpc/include/asm/percpu.h
>> index dce863a7635c..8e5b7d0b851c 100644
>> --- a/arch/powerpc/include/asm/percpu.h
>> +++ b/arch/powerpc/include/asm/percpu.h
>> @@ -10,8 +10,6 @@
>>
>> #ifdef CONFIG_SMP
>>
>> -#include <asm/paca.h>
>> -
>> #define __my_cpu_offset local_paca->data_offset
>>
>> #endif /* CONFIG_SMP */
>> @@ -19,4 +17,6 @@
>>
>> #include <asm-generic/percpu.h>
>>
>> +#include <asm/paca.h>
>> +
>> #endif /* _ASM_POWERPC_PERCPU_H_ */
>>
>>
>> So I think I'm inclined to merge that as a minimal fix that's easy to
>> backport.
>>
>> cheers
>
> Looks ok, except does it matter that the include used to be only done
> if __powerpc64__ and CONFIG_SMP are defined?
Basically all of paca.h is inside #ifdef CONFIG_PPC64.
SMP "shouldn't matter", but I tested a SMP=n build and it's clean, so I
think it's good. Of course there's really no guarantees with these
header tangles.
cheers
prev parent reply other threads:[~2020-08-04 0:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-02 10:48 powerpc: build failures in Linus' tree Stephen Rothwell
2020-08-02 17:20 ` Willy Tarreau
2020-08-03 3:45 ` Willy Tarreau
2020-08-03 4:10 ` Stephen Rothwell
2020-08-03 5:33 ` Willy Tarreau
2020-08-03 11:18 ` Michael Ellerman
2020-08-03 12:17 ` Willy Tarreau
2020-08-03 12:31 ` Stephen Rothwell
2020-08-04 0:49 ` Michael Ellerman [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=87pn87z14f.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=w@1wt.eu \
/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;
as well as URLs for NNTP newsgroup(s).