4 files changed, 10 insertions, 12 deletions

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 7d39ff43e6e..1b36ef18c48 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -93,7 +93,6 @@ struct symbol {
 #define SYMBOL_NEW              0x0800
 #define SYMBOL_AUTO             0x1000
 #define SYMBOL_CHECKED          0x2000
-#define SYMBOL_CHECK_DONE       0x4000
 #define SYMBOL_WARNED           0x8000
 
 #define SYMBOL_MAXLENGTH        256
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index affa52f5c65..10d96c4188d 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -731,12 +731,12 @@ struct symbol *sym_check_deps(struct symbol *sym)
         struct symbol *sym2;
         struct property *prop;
 
-        if (sym->flags & SYMBOL_CHECK_DONE)
-                return NULL;
         if (sym->flags & SYMBOL_CHECK) {
                 printf("Warning! Found recursive dependency: %s", sym->name);
                 return sym;
         }
+        if (sym->flags & SYMBOL_CHECKED)
+                return NULL;
 
         sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
         sym2 = sym_check_expr_deps(sym->rev_dep.expr);
@@ -756,8 +756,13 @@ struct symbol *sym_check_deps(struct symbol *sym)
                         goto out;
         }
 out:
-        if (sym2)
+        if (sym2) {
                 printf(" %s", sym->name);
+                if (sym2 == sym) {
+                        printf("\n");
+                        sym2 = NULL;
+                }
+        }
         sym->flags &= ~SYMBOL_CHECK;
         return sym2;
 }
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index ff4fcc09720..da12f7b33be 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1933,10 +1933,7 @@ void conf_parse(const char *name)
                 exit(1);
         menu_finalize(&rootmenu);
         for_all_symbols(i, sym) {
-                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
-                        printf("\n");
-                else
-                        sym->flags |= SYMBOL_CHECK_DONE;
+                sym_check_deps(sym);
         }
 
         sym_change_count = 1;
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index e1a0f455d4a..1e214e9c1d3 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -495,10 +495,7 @@ void conf_parse(const char *name)
                 exit(1);
         menu_finalize(&rootmenu);
         for_all_symbols(i, sym) {
-                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
-                        printf("\n");
-                else
-                        sym->flags |= SYMBOL_CHECK_DONE;
+                sym_check_deps(sym);
         }
 
         sym_change_count = 1;