From d9ae21480f98795e8f721a62f82cca8689db75bd Mon Sep 17 00:00:00 2001 From: Mahesh Salgaonkar Date: Mon, 12 Feb 2024 16:26:57 +0530 Subject: [PATCH] Try without CONFIG_JUMP_LABEL Signed-off-by: Mahesh Salgaonkar --- arch/powerpc/include/asm/percpu.h | 7 +------ arch/powerpc/kernel/setup_64.c | 8 -------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/powerpc/include/asm/percpu.h b/arch/powerpc/include/asm/percpu.h index 6b4dce4e78d5f..b46fef84f685d 100644 --- a/arch/powerpc/include/asm/percpu.h +++ b/arch/powerpc/include/asm/percpu.h @@ -12,17 +12,12 @@ #define __my_cpu_offset local_paca->data_offset -#ifdef CONFIG_JUMP_LABEL +#include DECLARE_STATIC_KEY_FALSE(__percpu_embed_first_chunk); #define is_embed_first_chunk \ (static_key_enabled(&__percpu_embed_first_chunk.key)) -#else /* !CONFIG_JUMP_LABEL */ -extern bool __percpu_embed_first_chunk; -#define is_embed_first_chunk __percpu_embed_first_chunk - -#endif /* CONFIG_JUMP_LABEL */ #endif /* CONFIG_SMP */ #endif /* __powerpc64__ */ diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 674b6e1bebe9a..cbd3b4c82316c 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -834,11 +834,7 @@ static __init int pcpu_cpu_to_node(int cpu) unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; EXPORT_SYMBOL(__per_cpu_offset); -#ifdef CONFIG_JUMP_LABEL DEFINE_STATIC_KEY_FALSE(__percpu_embed_first_chunk); -#else -bool __percpu_embed_first_chunk; -#endif void __init setup_per_cpu_areas(void) { @@ -875,11 +871,7 @@ void __init setup_per_cpu_areas(void) "falling back to page size\n", pcpu_fc_names[pcpu_chosen_fc], rc); else { -#ifdef CONFIG_JUMP_LABEL static_key_enable(&__percpu_embed_first_chunk.key); -#else - __percpu_embed_first_chunk = true; -#endif } }