Skip to content

Commit

Permalink
unbreak allmodconfig KCONFIG_ALLCONFIG=...
Browse files Browse the repository at this point in the history
	Prior to 3.13 make allmodconfig KCONFIG_ALLCONFIG=/dev/null used
to be equivalent to make allmodconfig; these days it hardwires MODULES to n.
In fact, any KCONFIG_ALLCONFIG that doesn't set MODULES explicitly is
treated as if it set it to n.

	Regression had been introduced by commit cfa98f ("kconfig: do not
override symbols already set"); what happens is that conf_read_simple()
does sym_calc_value(modules_sym) on exit, which leaves SYMBOL_VALID set and
has conf_set_all_new_symbols() skip modules_sym.

	It's pretty easy to fix - simply move that call of sym_calc_value()
into the callers, except for the ones in KCONFIG_ALLCONFIG handling.
Objections?

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Fixes: cfa98f2 ("kconfig: do not override symbols already set")
Signed-off-by: Michal Marek <mmarek@suse.com>
  • Loading branch information
Al Viro authored and Michal Marek committed Feb 1, 2016
1 parent 42f9d3c commit 6b87b70
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def)
if (in)
goto load;
sym_add_change_count(1);
if (!sym_defconfig_list) {
sym_calc_value(modules_sym);
if (!sym_defconfig_list)
return 1;
}

for_all_defaults(sym_defconfig_list, prop) {
if (expr_calc_value(prop->visible.expr) == no ||
Expand Down Expand Up @@ -403,7 +401,6 @@ int conf_read_simple(const char *name, int def)
}
free(line);
fclose(in);
sym_calc_value(modules_sym);
return 0;
}

Expand All @@ -414,8 +411,12 @@ int conf_read(const char *name)

sym_set_change_count(0);

if (conf_read_simple(name, S_DEF_USER))
if (conf_read_simple(name, S_DEF_USER)) {
sym_calc_value(modules_sym);
return 1;
}

sym_calc_value(modules_sym);

for_all_symbols(i, sym) {
sym_calc_value(sym);
Expand Down Expand Up @@ -846,6 +847,7 @@ static int conf_split_config(void)

name = conf_get_autoconfig_name();
conf_read_simple(name, S_DEF_AUTO);
sym_calc_value(modules_sym);

if (chdir("include/config"))
return 1;
Expand Down

0 comments on commit 6b87b70

Please sign in to comment.