Skip to content

Commit 5af385f

Browse files
Matthew Wilcox (Oracle)torvalds
authored andcommitted
bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS
bits_per() rounds up to the next power of two when passed a power of two. This causes crashes on some machines and configurations. Reported-by: Михаил Новоселов <[email protected]> Tested-by: Ильфат Гаптрахманов <[email protected]> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3347 Link: https://lore.kernel.org/all/[email protected]/ Fixes: f2d5dcb (bounds: support non-power-of-two CONFIG_NR_CPUS) Cc: <[email protected]> Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e67572c commit 5af385f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/bounds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ int main(void)
1919
DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
2020
DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
2121
#ifdef CONFIG_SMP
22-
DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS));
22+
DEFINE(NR_CPUS_BITS, order_base_2(CONFIG_NR_CPUS));
2323
#endif
2424
DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t));
2525
#ifdef CONFIG_LRU_GEN

0 commit comments

Comments
 (0)