Hi all, After merging the tip tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: Caused by commit f670269a42bf ("x86: Fix early boot crash on gcc-10, next try") interacting with commit a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try") from Linus' tree (v5.7-rc6) - the automatic merge did not go well. I have added this patch for today (it removes the older version). From: Stephen Rothwell Date: Thu, 3 Sep 2020 12:31:13 +1000 Subject: [PATCH] merge fix for compiler.h Signed-off-by: Stephen Rothwell --- include/linux/compiler.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index d60365d4fb56..b78233fb1af7 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -223,12 +223,6 @@ static inline void *offset_to_ptr(const int *off) /* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) -/* - * This is needed in functions which generate the stack canary, see - * arch/x86/kernel/smpboot.c::start_secondary() for an example. - */ -#define prevent_tail_call_optimization() mb() - #include /* -- 2.28.0 -- Cheers, Stephen Rothwell