Try without CONFIG_JUMP_LABEL

Signed-off-by: Mahesh Salgaonkar <[email protected]>
maheshsal · Feb 12, 2024 · d9ae214 · d9ae214
1 parent b1bd90d
commit d9ae214
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git 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 <linux/jump_label.h>
 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
@@ -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
 		}
 	}