On Mon, Jul 18, 2016 at 06:00:23PM +0200, Arnd Bergmann wrote:

Using "make tinyconfig" produces a couple of annoying warnings that show up for build test machines all the time:

.config:966:warning: override: NOHIGHMEM changes choice state
.config:965:warning: override: SLOB changes choice state
.config:963:warning: override: KERNEL_XZ changes choice state
.config:962:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state
.config:933:warning: override: SLOB changes choice state
.config:930:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state
.config:870:warning: override: SLOB changes choice state
.config:868:warning: override: KERNEL_XZ changes choice state
.config:867:warning: override: CC_OPTIMIZE_FOR_SIZE changes choice state

I've made a previous attempt at fixing them and we discussed a number of alternatives.

I tried changing the Makefile to use "merge_config.sh -n $(fragment-list)" but couldn't get that to work properly.

This is yet another approach, based on the observation that we do want to see a warning for conflicting 'choice' options, and that we can simply make them non-conflicting by listing all other options as disabled. This is a trivial patch that we can apply independent of plans for other changes.

Signed-off-by: Arnd Bergmann arnd@arndb.de

Reviewed-by: Josh Triplett josh@joshtriplett.org

This does introduce additional warnings for changing those newly listed options, but then we only have one type of warning, which will go away with whatever fix you make to the underlying config merge machinery.

I'll send a follow-up patch doing the same for arch/x86/configs/tiny.config, whose one config symbol (NOHIGHMEM) also forms part of a choice and produces the same warning.

I find it *mildly* annoying that this means the configs will need to change whenever any new choices appear, but at least we'll have warnings to tell us that.

kernel/configs/tiny.config | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/kernel/configs/tiny.config b/kernel/configs/tiny.config index c2de56ab0fce..3eeade4d876d 100644 --- a/kernel/configs/tiny.config +++ b/kernel/configs/tiny.config @@ -1,4 +1,12 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set CONFIG_KERNEL_XZ=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set CONFIG_OPTIMIZE_INLINING=y +# CONFIG_SLUB is not set +# CONFIG_SLAB is not set CONFIG_SLOB=y -- 2.9.0

The Kconfig machinery used to power tinyconfig produces a warning like this when changing a "choice" option without explicitly disabling the other choices:

.config:965:warning: override: NOHIGHMEM changes choice state

Expand arch/x86/configs/tiny.config to add entries disabling the other two choices, to eliminate this warning. (Doing so then introduces a different form of warning for changing any option at all, but that needs fixing in the underlying config merge machinery.)

Based on a similar change from Arnd Bergmann for the architecture-independent tiny.config.

Signed-off-by: Josh Triplett josh@joshtriplett.org Reported-by: Arnd Bergmann arnd@arndb.de --- arch/x86/configs/tiny.config | 2 ++ 1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/configs/tiny.config b/arch/x86/configs/tiny.config index 4e2ecfa..4b429df 100644 --- a/arch/x86/configs/tiny.config +++ b/arch/x86/configs/tiny.config @@ -1 +1,3 @@ CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set