3 files changed, 25 insertions, 17 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;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 26146cbaa504..74c2f9db2aac 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1512,13 +1512,13 @@ sub create_parameterlist($$$) {
             # corresponding data structures "correctly". Catch it later in
             # output_* subs.
             push_parameter($arg, "", $file);
-        } elsif ($arg =~ m/\(.*\*/) {
+        } elsif ($arg =~ m/\(.+\)\s*\(/) {
             # pointer-to-function
             $arg =~ tr/#/,/;
-            $arg =~ m/[^\(]+\(\*\s*([^\)]+)\)/;
+            $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/;
             $param = $1;
             $type = $arg;
-            $type =~ s/([^\(]+\(\*)$param/$1/;
+            $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
             push_parameter($param, $type, $file);
         } elsif ($arg) {
             $arg =~ s/\s*:\s*/:/g;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 61742771c65d..695b5d657cf5 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1200,7 +1200,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
                 "annotate %s with a matching annotation.\n",
                 from, sec2annotation(fromsec), fromsym, from_p,
                 to, sec2annotation(tosec), tosym, to_p,
-                fromsym, tosym, fromsym);
+                tosym, fromsym, tosym);
                 break;
         case INIT_TO_EXIT:
                 fprintf(stderr,