From: "Yann E. MORIN" <[email protected]>
Michal,
Please pull this to revert:
422c809: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
It causes more harm that it fixes issues, and I couldn't find a proper
fix for now. To avoid breakage so close to the opening of the merge
window, it makes more sense to revert it than to wait for a fix.
As I already said earlier, I'll be on vacation the next two weeks, so
I should find some time to look back at this again, hopefully before
-rc1 is out (but any sane person that value his/her life should not hold
his/her breath...)
The following changes since commit e43956e607692f9b1c710311e4a6591ffba1edf0:
kconfig: implement KCONFIG_PROBABILITY for randconfig (2013-04-25 00:16:30 +0200)
are available in the git repository at:
git://gitorious.org/linux-kconfig/linux-kconfig.git yem-kconfig-for-next
for you to fetch changes up to 23a5dfdad22a574d19d7cc19b391f9ce0d3c2f21:
Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG" (2013-04-26 23:21:59 +0200)
----------------------------------------------------------------
Yann E. MORIN (1):
Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
scripts/kconfig/confdata.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Regards,
Yann E. MORIN
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
From: "Yann E. MORIN" <[email protected]>
This reverts commit 422c809f03f043d0950d8362214818e956a9daee.
It causes more harm than it solves issues.
Reported-by: Sedat Dilek <[email protected]>
Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: "Yann E. MORIN" <[email protected]>
Tested-by: Sedat Dilek <[email protected]>
Cc: Sedat Dilek <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: Thomas Petazzoni <[email protected]>
Cc: Greg KH <[email protected]>
---
scripts/kconfig/confdata.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index fc45fc1..43eda40 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -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);
@@ -1077,7 +1077,6 @@ static void randomize_choice_values(struct symbol *csym)
else {
sym->def[S_DEF_USER].tri = no;
}
- sym->flags &= ~(SYMBOL_VALID);
}
csym->flags |= SYMBOL_DEF_USER;
/* clear VALID to get value calculated */
--
1.8.1.2
On 27.4.2013 00:17, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <[email protected]>
>
> Michal,
>
> Please pull this to revert:
> 422c809: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
Pulled, thanks!
Michal