Skip to content

Commit 15aa09d

Browse files
Matthew Wilcox (Oracle)gregkh
authored andcommitted
bounds: Use the right number of bits for power-of-two CONFIG_NR_CPUS
commit 5af385f upstream. 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: Михаил Новоселов <m.novosyolov@rosalinux.ru> Tested-by: Ильфат Гаптрахманов <i.gaptrakhmanov@rosalinux.ru> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3347 Link: https://lore.kernel.org/all/1c978cf1-2934-4e66-e4b3-e81b04cb3571@rosalinux.ru/ Fixes: f2d5dcb (bounds: support non-power-of-two CONFIG_NR_CPUS) Cc: <stable@vger.kernel.org> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 57c34bf commit 15aa09d

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)