imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-28 21:02:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"

Browse Source 
This reverts commit 8357b48549.

It breaks more stuff than it fixes.

Reported-by: Fengguang Wu <[email protected]>
Reported-by: Sedat Dilek <[email protected]>
Signed-off-by: "Yann E. MORIN" <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: Sedat Dilek <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: Alexandre Bounine <[email protected]>
Cc: Matt Porter <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
This commit is contained in:
Yann E. MORIN authored and Michal Marek committed 2013-06-26 15:49:00 +02:00
1 parent 8357b48549
commit 490f161711
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
scripts/kconfig/confdata.c
+3 -3
View File
@@ -288,6 +288,8 @@ load:
for_all_symbols(i, sym) {
sym->flags |= SYMBOL_CHANGED;
sym->flags &= ~(def_flags|SYMBOL_VALID);
if (sym_is_choice(sym))
sym->flags |= def_flags;
switch (sym->type) {
case S_INT:
case S_HEX:
@@ -377,13 +379,13 @@ setsym:
case mod:
if (cs->def[def].tri == yes) {
conf_warning("%s creates inconsistent choice state", sym->name);
cs->flags &= ~def_flags;
}
break;
case yes:
if (cs->def[def].tri != no)
conf_warning("override: %s changes choice state", sym->name);
cs->def[def].val = sym;
cs->flags |= def_flags;
break;
}
cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
@@ -789,8 +791,6 @@ int conf_write(const char *name)
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE))
goto next;
if (sym_is_choice_value(sym) && !menu_is_visible(menu->parent))
goto next;
sym->flags &= ~SYMBOL_WRITE;
conf_write_symbol(out, sym, &kconfig_printer_cb, NULL);