From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Nicholas Piggin <npiggin@gmail•com>
Subject: linux-next: build failure after merge of the powerpc tree
Date: Fri, 19 Jan 2018 09:26:03 +1100 [thread overview]
Message-ID: <20180119092603.5adb8912@canb.auug.org.au> (raw)
Hi all,
After merging the powerpc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/asm-generic/bug.h:18:0,
from arch/powerpc/include/asm/bug.h:128,
from include/linux/bug.h:5,
from arch/powerpc/include/asm/mmu.h:126,
from arch/powerpc/include/asm/lppaca.h:36,
from arch/powerpc/include/asm/paca.h:21,
from arch/powerpc/include/asm/current.h:16,
from include/linux/sched.h:12,
from arch/powerpc/kernel/setup_64.c:15:
arch/powerpc/kernel/setup_64.c: In function 'init_fallback_flush':
arch/powerpc/kernel/setup_64.c:864:14: error: implicit declaration of function 'safe_stack_limit'; did you mean 'save_stack_trace'? [-Werror=implicit-function-declaration]
limit = min(safe_stack_limit(), ppc64_rma_size);
^
include/linux/kernel.h:790:2: note: in definition of macro '__min'
t1 min1 = (x); \
^~
arch/powerpc/kernel/setup_64.c:864:10: note: in expansion of macro 'min'
limit = min(safe_stack_limit(), ppc64_rma_size);
^~~
include/linux/kernel.h:792:16: error: comparison of distinct pointer types lacks a cast [-Werror]
(void) (&min1 == &min2); \
^
include/linux/kernel.h:801:2: note: in expansion of macro '__min'
__min(typeof(x), typeof(y), \
^~~~~
arch/powerpc/kernel/setup_64.c:864:10: note: in expansion of macro 'min'
limit = min(safe_stack_limit(), ppc64_rma_size);
^~~
Caused by commit
1af19331a3a1 ("powerpc/64s: Relax PACA address limitations")
interacting with commit
aa8a5e0062ac ("powerpc/64s: Add support for RFI flush of L1-D cache")
from Linus' tree.
I applied the following fix patch.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 19 Jan 2018 09:21:44 +1100
Subject: [PATCH] powerpc: fix up for safe_stack_limit rename
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/powerpc/kernel/setup_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 9e23c74896cc..f2b532f00861 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -861,7 +861,7 @@ static void init_fallback_flush(void)
int cpu;
l1d_size = ppc64_caches.l1d.size;
- limit = min(safe_stack_limit(), ppc64_rma_size);
+ limit = min(ppc64_bolted_size(), ppc64_rma_size);
/*
* Align to L1d size, and size it at 2x L1d size, to catch possible
--
2.15.1
--
Cheers,
Stephen Rothwell
next reply other threads:[~2018-01-18 22:26 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 22:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-09 10:09 linux-next: build failure after merge of the powerpc tree Stephen Rothwell
2024-09-09 14:22 ` Christophe Leroy
2024-09-09 14:58 ` Stephen Rothwell
2024-09-09 16:23 ` Masahiro Yamada
2024-09-09 17:28 ` Christophe Leroy
2023-02-10 3:38 Stephen Rothwell
2023-02-12 23:22 ` Michael Ellerman
2021-04-19 9:14 Stephen Rothwell
2021-04-19 9:59 ` Xiongwei Song
2021-04-19 12:24 ` Michael Ellerman
2021-02-09 10:19 Stephen Rothwell
2021-02-10 8:20 ` Nicholas Piggin
2021-02-10 11:18 ` Stephen Rothwell
2020-04-22 5:41 Stephen Rothwell
2020-04-22 6:35 ` Haren Myneni
2020-04-25 23:52 ` Michael Ellerman
2019-09-30 0:13 Stephen Rothwell
2019-10-03 23:05 ` Michael Ellerman
2019-10-11 8:22 ` Michael Ellerman
2019-09-02 11:40 Stephen Rothwell
2019-09-02 11:52 ` Christoph Hellwig
2019-02-22 7:14 Stephen Rothwell
2019-02-22 7:37 ` Christophe Leroy
2019-02-22 11:28 ` Michael Ellerman
2018-03-29 7:43 Stephen Rothwell
2018-01-19 5:53 Stephen Rothwell
2017-11-02 6:49 Stephen Rothwell
2017-11-14 11:12 ` Michael Ellerman
2016-11-22 8:58 Stephen Rothwell
2016-11-22 10:21 ` Stephen Rothwell
2016-11-23 2:02 ` Nicholas Piggin
2016-07-22 6:31 Stephen Rothwell
2016-07-01 5:27 Stephen Rothwell
2016-07-01 8:59 ` Colin Ian King
2016-01-07 8:16 Stephen Rothwell
2016-01-07 10:30 ` Michael Ellerman
2016-01-13 5:46 ` Aneesh Kumar K.V
2016-01-13 7:44 ` Michael Ellerman
2016-01-12 12:32 ` Michael Ellerman
2015-08-21 8:25 Stephen Rothwell
2015-08-21 8:59 ` Vasant Hegde
2015-08-21 23:40 ` Michael Ellerman
2015-08-22 4:09 ` Vasant Hegde
2015-08-22 11:16 ` Michael Ellerman
2014-08-06 6:31 Stephen Rothwell
2013-07-02 0:54 Stephen Rothwell
2013-07-02 2:00 ` Benjamin Herrenschmidt
2012-11-28 3:03 Stephen Rothwell
2012-11-28 4:28 ` Benjamin Herrenschmidt
2011-07-01 1:39 Stephen Rothwell
2011-07-01 3:00 ` Benjamin Herrenschmidt
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=20180119092603.5adb8912@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=npiggin@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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