From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Willy Tarreau <w@1wt.eu>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Linux-kernel Mailing List <linux-kernel@vger.kernel.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: powerpc: build failures in Linus' tree
Date: Mon, 3 Aug 2020 22:31:47 +1000 [thread overview]
Message-ID: <20200803223147.28adac79@canb.auug.org.au> (raw)
In-Reply-To: <87v9i0yo47.fsf@mpe.ellerman.id.au>
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
Hi Michael,
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?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-03 12:31 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 [this message]
2020-08-04 0:49 ` Michael Ellerman
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=20200803223147.28adac79@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--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).