[PATCH] kconfig: fix restart for choice symbols

The restart check whether new symbols became visible, didn't always work for
choice symbols.  Even if a choice symbol itself isn't changable, the childs
are.  This also requires to update the new status of all choice values, once
one of them is set.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 10d96c4188dd..29bff43adc5e 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -380,11 +380,22 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val)
                 sym->flags &= ~SYMBOL_NEW;
                 sym_set_changed(sym);
         }
+        /*
+         * setting a choice value also resets the new flag of the choice
+         * symbol and all other choice values.
+         */
         if (sym_is_choice_value(sym) && val == yes) {
                 struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+                struct property *prop;
+                struct expr *e;
 
                 cs->user.val = sym;
                 cs->flags &= ~SYMBOL_NEW;
+                prop = sym_get_choice_prop(cs);
+                for (e = prop->expr; e; e = e->left.expr) {
+                        if (e->right.sym->visible != no)
+                                e->right.sym->flags &= ~SYMBOL_NEW;
+                }
         }
 
         sym->user.tri = val;