Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED
  kbuild: fix building vmlinux.o
  kbuild: allow -fstack-protector to take effect
  kconfig: fix select in combination with default

1 files changed, 21 insertions, 13 deletions

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 3929e5b35e79..4a03191ad176 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -298,22 +298,30 @@ void sym_calc_value(struct symbol *sym)
                 if (sym_is_choice_value(sym) && sym->visible == yes) {
                         prop = sym_get_choice_prop(sym);
                         newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
-                } else if (EXPR_OR(sym->visible, sym->rev_dep.tri) != no) {
-                        sym->flags |= SYMBOL_WRITE;
-                        if (sym_has_value(sym))
-                                newval.tri = sym->def[S_DEF_USER].tri;
-                        else if (!sym_is_choice(sym)) {
-                                prop = sym_get_default_prop(sym);
-                                if (prop)
-                                        newval.tri = expr_calc_value(prop->expr);
+                } else {
+                        if (sym->visible != no) {
+                                /* if the symbol is visible use the user value
+                                 * if available, otherwise try the default value
+                                 */
+                                sym->flags |= SYMBOL_WRITE;
+                                if (sym_has_value(sym)) {
+                                        newval.tri = EXPR_AND(sym->def[S_DEF_USER].tri,
+                                                              sym->visible);
+                                        goto calc_newval;
+                                }
                         }
-                        newval.tri = EXPR_OR(EXPR_AND(newval.tri, sym->visible), sym->rev_dep.tri);
-                } else if (!sym_is_choice(sym)) {
-                        prop = sym_get_default_prop(sym);
-                        if (prop) {
+                        if (sym->rev_dep.tri != no)
                                 sym->flags |= SYMBOL_WRITE;
-                                newval.tri = expr_calc_value(prop->expr);
+                        if (!sym_is_choice(sym)) {
+                                prop = sym_get_default_prop(sym);
+                                if (prop) {
+                                        sym->flags |= SYMBOL_WRITE;
+                                        newval.tri = EXPR_AND(expr_calc_value(prop->expr),
+                                                              prop->visible.tri);
+                                }
                         }
+                calc_newval:
+                        newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
                 }
                 if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
                         newval.tri = yes;