Commit ffed15d3 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/kernel: Fix size of NUM_CPU_FTR_KEYS on 32-bit

The number of CPU feature keys is meant to map 1:1 to the number of CPU
feature flags defined in cputable.h, and the latter must fit in an
unsigned long.

In commit 4db73271 ("powerpc: Add option to use jump label for
cpu_has_feature()"), I incorrectly defined NUM_CPU_FTR_KEYS to 64.

There should be no real adverse consequences of this bug, other than us
allocating too many keys.

Fix it by using BITS_PER_LONG.

Fixes: 4db73271 ("powerpc: Add option to use jump label for cpu_has_feature()")
Tested-by: default avatarMeelis Roos <mroos@linux.ee>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bd00a240
...@@ -15,7 +15,7 @@ static inline bool early_cpu_has_feature(unsigned long feature) ...@@ -15,7 +15,7 @@ static inline bool early_cpu_has_feature(unsigned long feature)
#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECKS #ifdef CONFIG_JUMP_LABEL_FEATURE_CHECKS
#include <linux/jump_label.h> #include <linux/jump_label.h>
#define NUM_CPU_FTR_KEYS 64 #define NUM_CPU_FTR_KEYS BITS_PER_LONG
extern struct static_key_true cpu_feature_keys[NUM_CPU_FTR_KEYS]; extern struct static_key_true cpu_feature_keys[NUM_CPU_FTR_KEYS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment