m68k: Define NR_CPUS to 1
PATCH 1/1 m68k: Define NR_CPUS to 1
This fixes a Kconfig warning
fs/erofs/Kconfig:137:warning: range is invalid
which originates from EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS using NR_CPUS which up to now didn't exist for ARCH=m68k. All other architectures define this symbol, so fix the outlier.
--- arch/m68k/Kconfig.cpu | 4 ++++ 1 file changed, 4 insertions(+)
arch/m68k/Kconfig.cpu +4 -0
@@ -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
base-commit: 95d6a9ccef99117115e41e9adb271243bd5e985b
Signature · 1 line
2.55.0.11.g153666a7d9bb
Geert Uytterhoeven
maintainerHi Uwe,
Thanks for your patch!
Quoted 7 lines · Uwe Kleine-König
This fixes a
Kconfigwarningfs/erofs/Kconfig:137:warning: range is invalid
which originates from
EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMSusingNR_CPUSwhich up to now didn't exist for ARCH=m68k. All other architectures define this symbol, so fix the outlier.
Apart from the Kconfig warning, this also
1. Breaks pressing "ENTER" in "make oldconfig" to apply a sensible default value, just repeating the question ad infinitum instead (the default is 16),
2. "make olddefconfig" sets it to literal NR_CPUS, which is invalid, too.
arch/m68k/Kconfig.cpu config CACHE_COPYBACK · line 554
Quoted 12 lines
Fixes c9b47e6b2311 ("erofs: cap LZMA stream pool size")Signed-off-by Uwe Kleine-König <[email protected]>arch/m68k/Kconfig.cpu +3
-0@@ -549,6 +549,10 @@ config CACHE_COPYBACK endchoice endif # HAVE_CACHE_CB +config NR_CPUS + int + default "1"
While this does fix the issues on m68k, I don't think this is the right fix:
- NR_CPUS depends on SMP on most architectures, so you do not get the "range is invalid" warning on non-SMP, but NR_CPUS is zero. Hence I managed to reproduce the two issues above (albeit 2 with CONFIG_EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS=0) with a non-SMP ARM config.
- Kconfig logic using NR_CPUS typically includes a check for SMP, too.
So I think EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS should be fixed instead.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 41 lines · Geert Uytterhoeven
Hi Uwe,
Thanks for your patch!
Quoted 7 lines · Uwe Kleine-König
This fixes a
Kconfigwarningfs/erofs/Kconfig:137:warning: range is invalid
which originates from
EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMSusingNR_CPUSwhich up to now didn't exist for ARCH=m68k. All other architectures define this symbol, so fix the outlier.Apart from the
Kconfigwarning, this also
1. Breaks pressing "ENTER" in "make oldconfig" to apply a sensible default value, just repeating the question ad infinitum instead (the default is 16),
2. "make olddefconfig" sets it to literalNR_CPUS, which is invalid, too.arch/m68k/Kconfig.cpu config CACHE_COPYBACK · line 554
Quoted 12 lines
Fixes c9b47e6b2311 ("erofs: cap LZMA stream pool size")Signed-off-by Uwe Kleine-König <[email protected]>arch/m68k/Kconfig.cpu +3
-0@@ -549,6 +549,10 @@ config CACHE_COPYBACK endchoice endif # HAVE_CACHE_CB +config NR_CPUS + int + default "1"While this does fix the issues on m68k, I don't think this is the right fix:
-NR_CPUSdepends on SMP on most architectures, so you do not get the "range is invalid" warning on non-SMP, butNR_CPUSis zero. Hence I managed to reproduce the two issues above (albeit 2 withCONFIG_EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS=0) with a non-SMP ARM config.
-Kconfiglogic usingNR_CPUStypically includes a check for SMP, too.
Quoted 2 lines
So I think
EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMSshould be fixed instead.
Agreed, probably it should depend on SMP, too.
Thanks for your feedback
Uwe
Quoted 38 lines · Uwe Kleine-König
Quoted 37 lines · Geert Uytterhoeven
Quoted 7 lines · Uwe Kleine-König
This fixes a
Kconfigwarningfs/erofs/Kconfig:137:warning: range is invalid
which originates from
EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMSusingNR_CPUSwhich up to now didn't exist for ARCH=m68k. All other architectures define this symbol, so fix the outlier.Apart from the
Kconfigwarning, this also
1. Breaks pressing "ENTER" in "make oldconfig" to apply a sensible default value, just repeating the question ad infinitum instead (the default is 16),
2. "make olddefconfig" sets it to literalNR_CPUS, which is invalid, too.arch/m68k/Kconfig.cpu config CACHE_COPYBACK · line 554
Quoted 12 lines
Fixes c9b47e6b2311 ("erofs: cap LZMA stream pool size")Signed-off-by Uwe Kleine-König <[email protected]>arch/m68k/Kconfig.cpu +3
-0@@ -549,6 +549,10 @@ config CACHE_COPYBACK endchoice endif # HAVE_CACHE_CB +config NR_CPUS + int + default "1"While this does fix the issues on m68k, I don't think this is the right fix:
-NR_CPUSdepends on SMP on most architectures, so you do not get the "range is invalid" warning on non-SMP, butNR_CPUSis zero. Hence I managed to reproduce the two issues above (albeit 2 withCONFIG_EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS=0) with a non-SMP ARM config.
-Kconfiglogic usingNR_CPUStypically includes a check for SMP, too.
Quoted 4 lines
Quoted 2 lines
So I think
EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMSshould be fixed instead.Agreed, probably it should depend on SMP, too.
Since the underlying issue can be fixed by depending on SMP, but the warning would still be there[1], I decided to bite the bullet and take your patch as a fix for v7.2.
i.e. will queue in the m68k tree for v7.2.
[1] https://lore.kernel.org/CAMuHMdWQLwgShMK7G-6soiZxtRPYWLizBLRdouwxFUcFXUJM-Q@mail.gmail.com
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds