[PATCH] kconfig "choice" fixes

This fixes "choice" behaviour - it sets the correct default and fixes
oldconfig.

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 74c94c233aac5d9f6732abe96453c87d3f354d5b..e2f0833c24b317867cd8c29b2bc1d6415de1b52d 100644 (file)
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -342,6 +342,8 @@ static int conf_choice(struct menu *menu)
                case ask_new:
                case ask_silent:
                case ask_all:
+                       if (is_new)
+                               sym->flags |= SYMBOL_NEW;
                        conf_askvalue(sym, menu_get_prompt(def_menu));
                        strip(line);
                        break;

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 59c88d253bb74bf4372f925efc2138c088a6d298..2137b6a04d74ecec5b99a1a472141b615d31f3a1 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -204,7 +204,8 @@ void sym_calc_value(struct symbol *sym)
                                        sym_calc_value(prop->def);
                                        newval = prop->def->curr;
                                }
-                       }
+                       } else
+                               S_TRI(newval) = S_TRI(sym->def);
                } else
                        newval = sym->def;