Merge tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

64dc3ba5 · Linus Torvalds <[email protected]> · 2026-08-13 07:00:26 -07:00

Pull m68k fix from Geert Uytterhoeven:
 "Define NR_CPUS to 1.

  This fixes a long-standing but never critical before oddity on m68k,
  that turned into a serious configuration issue after a recent erofs
  change"

* tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Define NR_CPUS to 1

Commit: 64dc3ba55effbf8afcc0099162dfb4138009ad48
Parents: 3d6d8176 · 1fd495ef

Merge commit. Changes below are compared with the first parent: 3d6d8176.

Changes

1 files changed · +4 −0

File	Status	Add	Del	Content
arch/m68k/Kconfig.cpu	modified	+4	−0	View file

arch/m68k/Kconfig.cpu

View file

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 148f8a7..5a58cc1 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -549,6 +549,10 @@ config CACHE_COPYBACK
 endchoice
 endif # HAVE_CACHE_CB
 
+config NR_CPUS
+	int
+	default "1"
+
 # Coldfire cores that do not have a data cache configured can do coherent DMA.
 config COLDFIRE_COHERENT_DMA
 	bool