diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-04-24 18:14:27 +0200 |
|---|---|---|
| committer | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-04-25 00:15:47 +0200 |
| commit | 61fa0e17f99b60b851d4480605b7d905d3172f0c (patch) | |
| tree | 27ea5d1a501e65d11890c2fb3e706f601c11f4c0 | |
| parent | cdf0c2cfd75c6c2f2a6eee5e21ff0e8271bd0660 (diff) | |
| download | linux-3.10-61fa0e17f99b60b851d4480605b7d905d3172f0c.tar.gz linux-3.10-61fa0e17f99b60b851d4480605b7d905d3172f0c.tar.bz2 linux-3.10-61fa0e17f99b60b851d4480605b7d905d3172f0c.zip | |
kconfig: fix randconfig tristate detection
Because the modules' symbole (CONFIG_MODULES) may not yet be set when
we check a symbol's tristate capabilty, we'll always find that tristate
symbols are booleans, even if we randomly decided that to enable modules:
sym_get_type(sym) always return boolean for tristates when modules_sym
has not been previously set to 'y' *and* its value calculated *and* its
visibility calculated, both of which only occur after we randomly assign
values to symbols.
Fix that by looking at the raw type of symbols. Tristate set to 'm' will
be promoted to 'y' when their values will be later calculated.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
| -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 13ddf1126c2..306cbc1bac0 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -1125,7 +1125,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode) sym->def[S_DEF_USER].tri = no; break; case def_random: - cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2; + cnt = sym->type == S_TRISTATE ? 3 : 2; sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt); break; default: |