Re: [PATCH] powerpc/64s: Always disable branch profiling for prom_init.o

2019-11-14 Thread Michael Ellerman 
On Wed, 2019-11-06 at 05:11:29 UTC, Michael Ellerman wrote:
> Otherwise the build fails because prom_init is calling symbols it's
> not allowed to, eg:
> 
>   Error: External symbol 'ftrace_likely_update' referenced from prom_init.c
>   make[3]: *** [arch/powerpc/kernel/Makefile:197: 
> arch/powerpc/kernel/prom_init_check] Error 1
> 
> Signed-off-by: Michael Ellerman 

Applied to powerpc next.

https://git.kernel.org/powerpc/c/6266a4dadb1d0976490fdf5af4f7941e36f64e80

cheers

[PATCH] powerpc/64s: Always disable branch profiling for prom_init.o

2019-11-05 Thread Michael Ellerman 
Otherwise the build fails because prom_init is calling symbols it's
not allowed to, eg:

  Error: External symbol 'ftrace_likely_update' referenced from prom_init.c
  make[3]: *** [arch/powerpc/kernel/Makefile:197: 
arch/powerpc/kernel/prom_init_check] Error 1

Signed-off-by: Michael Ellerman 
---
 arch/powerpc/kernel/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 4fdd8a3e775b..717b52b65d62 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -22,6 +22,7 @@ CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
 CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
 
 CFLAGS_prom_init.o += $(call cc-option, -fno-stack-protector)
+CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING
 
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace early boot code
@@ -39,7 +40,6 @@ KASAN_SANITIZE_btext.o := n
 ifdef CONFIG_KASAN
 CFLAGS_early_32.o += -DDISABLE_BRANCH_PROFILING
 CFLAGS_cputable.o += -DDISABLE_BRANCH_PROFILING
-CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING
 CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING
 endif
 
-- 
2.21.0