diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-13 07:00:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-13 07:00:26 -0700 |
| commit | 64dc3ba55effbf8afcc0099162dfb4138009ad48 (patch) | |
| tree | 80336659e12bde884a59cd016a889c2eb653e75d | |
| parent | 3d6d817622b0a9721e3cc404df3469171582be13 (diff) | |
| parent | 1fd495ef09eef96169a379a749c24b5e69974bb8 (diff) | |
| download | linux-64dc3ba55effbf8afcc0099162dfb4138009ad48.tar.gz linux-64dc3ba55effbf8afcc0099162dfb4138009ad48.zip | |
Merge tag 'm68k-for-v7.2-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
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
| -rw-r--r-- | arch/m68k/Kconfig.cpu | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu index 148f8a79d206..5a58cc13229e 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 |