diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-02-01 14:03:11 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:34:39 +0100 |
| commit | 296372fbd4cf7aab8d139b565d08705cc5499e11 (patch) | |
| tree | a2a1664b75b2ebc0e942e15f94c45bce9e949281 /scripts | |
| parent | 5fe69d2ba08f516ace6496d40ac47fe33d3d4ec7 (diff) | |
| download | linux-stable-296372fbd4cf7aab8d139b565d08705cc5499e11.tar.gz linux-stable-296372fbd4cf7aab8d139b565d08705cc5499e11.tar.bz2 linux-stable-296372fbd4cf7aab8d139b565d08705cc5499e11.zip | |
kconfig: fix broken dependency in randconfig-generated .config
[ Upstream commit c8fb7d7e48d11520ad24808cfce7afb7b9c9f798 ]
Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5)
produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y,
which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.
This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs
CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the
value of CONFIG_EFI is calculated.
When this happens, the has_changed flag should be set.
Currently, it takes the result from the last iteration. It should
accumulate all the results of the loop.
Fixes: 3b9a19e08960 ("kconfig: loop as long as we changed some symbols in randconfig")
Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/confdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 0dde19cf7486..2caf5fac102a 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -1314,7 +1314,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode) sym_calc_value(csym); if (mode == def_random) - has_changed = randomize_choice_values(csym); + has_changed |= randomize_choice_values(csym); else { set_all_choice_values(csym); has_changed = true; |