Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

5 files changed, 6 insertions, 7 deletions

diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 6a36a76e6606..624f6502e03e 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -17,6 +17,7 @@ gconf.glade.h
 #
 conf
 mconf
+nconf
 qconf
 gconf
 kxgettext
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index eba5906dc4ab..5459a38be866 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -598,12 +598,12 @@ int main(int ac, char **av)
                 break;
         case savedefconfig:
                 break;
-        case oldconfig:
         case oldaskconfig:
                 rootEntry = &rootmenu;
                 conf(&rootmenu);
                 input_mode = silentoldconfig;
                 /* fall through */
+        case oldconfig:
         case listnewconfig:
         case oldnoconfig:
         case silentoldconfig:
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 648c609caba0..184eb6a0b505 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -165,7 +165,6 @@ struct menu {
         struct symbol *sym;
         struct property *prompt;
         struct expr *dep;
-        struct expr *dir_dep;
         unsigned int flags;
         char *help;
         struct file *file;
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 23acbdb2fd50..7e83aef42c6d 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -107,7 +107,6 @@ static struct expr *menu_check_dep(struct expr *e)
 void menu_add_dep(struct expr *dep)
 {
         current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
-        current_entry->dir_dep = current_entry->dep;
 }
 
 void menu_set_type(int type)
@@ -291,10 +290,6 @@ void menu_finalize(struct menu *parent)
                 for (menu = parent->list; menu; menu = menu->next)
                         menu_finalize(menu);
         } else if (sym) {
-                /* ignore inherited dependencies for dir_dep */
-                sym->dir_dep.expr = expr_transform(expr_copy(parent->dir_dep));
-                sym->dir_dep.expr = expr_eliminate_dups(sym->dir_dep.expr);
-
                 basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
                 basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
                 basedep = expr_eliminate_dups(expr_transform(basedep));
@@ -325,6 +320,8 @@ void menu_finalize(struct menu *parent)
                         parent->next = last_menu->next;
                         last_menu->next = NULL;
                 }
+
+                sym->dir_dep.expr = parent->dep;
         }
         for (menu = parent->list; menu; menu = menu->next) {
                 if (sym && sym_is_choice(sym) &&
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c0efe102d655..cb0056841974 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -350,6 +350,7 @@ void sym_calc_value(struct symbol *sym)
                                 }
                         }
                 calc_newval:
+#if 0
                         if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
                                 fprintf(stderr, "warning: (");
                                 expr_fprint(sym->rev_dep.expr, stderr);
@@ -358,6 +359,7 @@ void sym_calc_value(struct symbol *sym)
                                 expr_fprint(sym->dir_dep.expr, stderr);
                                 fprintf(stderr, ")\n");
                         }
+#endif
                         newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
                 }
                 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)