From: "Yann E. MORIN" <yann.morin.1998@xxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@xxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: Michal Marek <mmarek@xxxxxxx> --- scripts/kconfig/confdata.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 87f7238..0cbfc67 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -399,8 +399,6 @@ setsym: free(line); fclose(in); - if (modules_sym) - sym_calc_value(modules_sym); return 0; } @@ -1175,6 +1173,10 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode) sym->def[S_DEF_USER].tri = yes; break; case def_mod: + /* Note: although modules_sym must be 'yes' to + * enable tristates, 'mod' is promoted to 'yes' + * when applied to a boolean, which modules_sym + * is. So we need not special-case it here. */ sym->def[S_DEF_USER].tri = mod; break; case def_no: -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
