23 files changed, 631 insertions, 213 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 01df30af4d4a..2c47f9c305aa 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -372,10 +372,14 @@ endif
 #    <composite-object>-objs := <list of .o files>
 #  or
 #    <composite-object>-y    := <list of .o files>
+#  or
+#    <composite-object>-m    := <list of .o files>
+#  The -m syntax only works if <composite object> is a module
 link_multi_deps =                     \
 $(filter $(addprefix $(obj)/,         \
 $($(subst $(obj)/,,$(@:.o=-objs)))    \
-$($(subst $(obj)/,,$(@:.o=-y)))), $^)
+$($(subst $(obj)/,,$(@:.o=-y)))       \
+$($(subst $(obj)/,,$(@:.o=-m)))), $^)
 
 quiet_cmd_link_multi-y = LD      $@
 cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
@@ -390,7 +394,7 @@ $(call multi_depend, $(multi-used-y), .o, -objs -y)
 $(multi-used-m): FORCE
         $(call if_changed,link_multi-m)
         @{ echo $(@:.o=.ko); echo $(link_multi_deps); } > $(MODVERDIR)/$(@F:.o=.mod)
-$(call multi_depend, $(multi-used-m), .o, -objs -y)
+$(call multi_depend, $(multi-used-m), .o, -objs -y -m)
 
 targets += $(multi-used-y) $(multi-used-m)
 
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 4efedcbe4165..f9e47a70509c 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -25,6 +25,7 @@ warning-1 += -Wold-style-definition
 warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
 warning-1 += $(call cc-disable-warning, missing-field-initializers)
+warning-1 += $(call cc-disable-warning, sign-compare)
 
 warning-2 := -Waggregate-return
 warning-2 += -Wcast-align
@@ -33,6 +34,7 @@ warning-2 += -Wnested-externs
 warning-2 += -Wshadow
 warning-2 += $(call cc-option, -Wlogical-op)
 warning-2 += $(call cc-option, -Wmissing-field-initializers)
+warning-2 += $(call cc-option, -Wsign-compare)
 
 warning-3 := -Wbad-function-cast
 warning-3 += -Wcast-qual
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 79e86613712f..2edbcadb3d7f 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -48,7 +48,7 @@ subdir-ym	:= $(sort $(subdir-y) $(subdir-m))
 
 # if $(foo-objs) exists, foo.o is a composite object
 multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
-multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
+multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))), $(m))))
 multi-used   := $(multi-used-y) $(multi-used-m)
 single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
 
@@ -67,7 +67,7 @@ obj-dirs := $(dir $(multi-objs) $(obj-y))
 
 # Replace multi-part objects by their individual parts, look at local dir only
 real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y)
-real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
+real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))
 
 # Add subdir path
 
@@ -104,8 +104,9 @@ modname_flags  = $(if $(filter 1,$(words $(modname))),\
 orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \
                  $(ccflags-y) $(CFLAGS_$(basetarget).o)
 _c_flags       = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
-_a_flags       = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
+orig_a_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
                  $(asflags-y) $(AFLAGS_$(basetarget).o)
+_a_flags       = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags))
 _cpp_flags     = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
 
 #
@@ -129,6 +130,12 @@ _c_flags += $(if $(patsubst n%,, \
                 $(CFLAGS_KASAN))
 endif
 
+ifeq ($(CONFIG_UBSAN),y)
+_c_flags += $(if $(patsubst n%,, \
+                $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \
+                $(CFLAGS_UBSAN))
+endif
+
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan
new file mode 100644
index 000000000000..8ab68679cfb5
--- /dev/null
+++ b/scripts/Makefile.ubsan
@@ -0,0 +1,17 @@
+ifdef CONFIG_UBSAN
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=shift)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=integer-divide-by-zero)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=unreachable)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=vla-bound)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=null)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=signed-integer-overflow)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=bounds)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=object-size)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=returns-nonnull-attribute)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=bool)
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=enum)
+
+ifdef CONFIG_UBSAN_ALIGNMENT
+      CFLAGS_UBSAN += $(call cc-option, -fsanitize=alignment)
+endif
+endif
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index c68fd61fdc42..5b327c67a828 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -251,7 +251,7 @@ static void parse_config_file(const char *map, size_t len)
 }
 
 /* test is s ends in sub */
-static int strrcmp(char *s, char *sub)
+static int strrcmp(const char *s, const char *sub)
 {
         int slen = strlen(s);
         int sublen = strlen(sub);
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 23e78dcd12bf..38b64f487315 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -58,8 +58,8 @@ for name in common:
 delta.sort()
 delta.reverse()
 
-print "add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s (%s)" % \
-      (add, remove, grow, shrink, up, -down, up-down)
-print "%-40s %7s %7s %+7s" % ("function", "old", "new", "delta")
+print("add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s (%s)" % \
+      (add, remove, grow, shrink, up, -down, up-down))
+print("%-40s %7s %7s %+7s" % ("function", "old", "new", "delta"))
 for d, n in delta:
-    if d: print "%-40s %7s %7s %+7d" % (n, old.get(n,"-"), new.get(n,"-"), d)
+    if d: print("%-40s %7s %7s %+7d" % (n, old.get(n,"-"), new.get(n,"-"), d))
diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
index 2f4b7ffd5570..d8f6c094cce5 100755
--- a/scripts/checkkconfigsymbols.py
+++ b/scripts/checkkconfigsymbols.py
@@ -8,11 +8,14 @@
 # Licensed under the terms of the GNU GPL License version 2
 
 
+import difflib
 import os
 import re
+import signal
 import sys
-from subprocess import Popen, PIPE, STDOUT
+from multiprocessing import Pool, cpu_count
 from optparse import OptionParser
+from subprocess import Popen, PIPE, STDOUT
 
 
 # regex expressions
@@ -26,7 +29,7 @@ SOURCE_FEATURE = r"(?:\W|\b)+[D]{,1}CONFIG_(" + FEATURE + r")"
 
 # regex objects
 REGEX_FILE_KCONFIG = re.compile(r".*Kconfig[\.\w+\-]*$")
-REGEX_FEATURE = re.compile(r'(?!\B"[^"]*)' + FEATURE + r'(?![^"]*"\B)')
+REGEX_FEATURE = re.compile(r'(?!\B)' + FEATURE + r'(?!\B)')
 REGEX_SOURCE_FEATURE = re.compile(SOURCE_FEATURE)
 REGEX_KCONFIG_DEF = re.compile(DEF)
 REGEX_KCONFIG_EXPR = re.compile(EXPR)
@@ -34,6 +37,7 @@ REGEX_KCONFIG_STMT = re.compile(STMT)
 REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$")
 REGEX_FILTER_FEATURES = re.compile(r"[A-Za-z0-9]$")
 REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
+REGEX_QUOTES = re.compile("(\"(.*?)\")")
 
 
 def parse_options():
@@ -71,6 +75,9 @@ def parse_options():
                            "the pattern needs to be a Python regex.  To "
                            "ignore defconfigs, specify -i '.*defconfig'.")
 
+    parser.add_option('-s', '--sim', dest='sim', action='store', default="",
+                      help="Print a list of maximum 10 string-similar symbols.")
+
     parser.add_option('', '--force', dest='force', action='store_true',
                       default=False,
                       help="Reset current Git tree even when it's dirty.")
@@ -109,6 +116,18 @@ def main():
     """Main function of this module."""
     opts = parse_options()
 
+    if opts.sim and not opts.commit and not opts.diff:
+        sims = find_sims(opts.sim, opts.ignore)
+        if sims:
+            print "%s: %s" % (yel("Similar symbols"), ', '.join(sims))
+        else:
+            print "%s: no similar symbols found" % yel("Similar symbols")
+        sys.exit(0)
+
+    # dictionary of (un)defined symbols
+    defined = {}
+    undefined = {}
+
     if opts.commit or opts.diff:
         head = get_head()
 
@@ -127,40 +146,56 @@ def main():
 
         # get undefined items before the commit
         execute("git reset --hard %s" % commit_a)
-        undefined_a = check_symbols(opts.ignore)
+        undefined_a, _ = check_symbols(opts.ignore)
 
         # get undefined items for the commit
         execute("git reset --hard %s" % commit_b)
-        undefined_b = check_symbols(opts.ignore)
+        undefined_b, defined = check_symbols(opts.ignore)
 
         # report cases that are present for the commit but not before
         for feature in sorted(undefined_b):
             # feature has not been undefined before
             if not feature in undefined_a:
                 files = sorted(undefined_b.get(feature))
-                print "%s\t%s" % (yel(feature), ", ".join(files))
-                if opts.find:
-                    commits = find_commits(feature, opts.diff)
-                    print red(commits)
+                undefined[feature] = files
             # check if there are new files that reference the undefined feature
             else:
                 files = sorted(undefined_b.get(feature) -
                                undefined_a.get(feature))
                 if files:
-                    print "%s\t%s" % (yel(feature), ", ".join(files))
-                    if opts.find:
-                        commits = find_commits(feature, opts.diff)
-                        print red(commits)
+                    undefined[feature] = files
 
         # reset to head
         execute("git reset --hard %s" % head)
 
     # default to check the entire tree
     else:
-        undefined = check_symbols(opts.ignore)
-        for feature in sorted(undefined):
-            files = sorted(undefined.get(feature))
-            print "%s\t%s" % (yel(feature), ", ".join(files))
+        undefined, defined = check_symbols(opts.ignore)
+
+    # now print the output
+    for feature in sorted(undefined):
+        print red(feature)
+
+        files = sorted(undefined.get(feature))
+        print "%s: %s" % (yel("Referencing files"), ", ".join(files))
+
+        sims = find_sims(feature, opts.ignore, defined)
+        sims_out = yel("Similar symbols")
+        if sims:
+            print "%s: %s" % (sims_out, ', '.join(sims))
+        else:
+            print "%s: %s" % (sims_out, "no similar symbols found")
+
+        if opts.find:
+            print "%s:" % yel("Commits changing symbol")
+            commits = find_commits(feature, opts.diff)
+            if commits:
+                for commit in commits:
+                    commit = commit.split(" ", 1)
+                    print "\t- %s (\"%s\")" % (yel(commit[0]), commit[1])
+            else:
+                print "\t- no commit found"
+        print  #  new line
 
 
 def yel(string):
@@ -190,7 +225,7 @@ def find_commits(symbol, diff):
     """Find commits changing %symbol in the given range of %diff."""
     commits = execute("git log --pretty=oneline --abbrev-commit -G %s %s"
                       % (symbol, diff))
-    return commits
+    return [x for x in commits.split("\n") if x]
 
 
 def tree_is_dirty():
@@ -209,43 +244,107 @@ def get_head():
     return stdout.strip('\n')
 
 
-def check_symbols(ignore):
-    """Find undefined Kconfig symbols and return a dict with the symbol as key
-    and a list of referencing files as value.  Files matching %ignore are not
-    checked for undefined symbols."""
-    source_files = []
-    kconfig_files = []
-    defined_features = set()
-    referenced_features = dict()  # {feature: [files]}
+def partition(lst, size):
+    """Partition list @lst into eveni-sized lists of size @size."""
+    return [lst[i::size] for i in xrange(size)]
+
+
+def init_worker():
+    """Set signal handler to ignore SIGINT."""
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+
+def find_sims(symbol, ignore, defined = []):
+    """Return a list of max. ten Kconfig symbols that are string-similar to
+    @symbol."""
+    if defined:
+        return sorted(difflib.get_close_matches(symbol, set(defined), 10))
+
+    pool = Pool(cpu_count(), init_worker)
+    kfiles = []
+    for gitfile in get_files():
+        if REGEX_FILE_KCONFIG.match(gitfile):
+            kfiles.append(gitfile)
 
+    arglist = []
+    for part in partition(kfiles, cpu_count()):
+        arglist.append((part, ignore))
+
+    for res in pool.map(parse_kconfig_files, arglist):
+        defined.extend(res[0])
+
+    return sorted(difflib.get_close_matches(symbol, set(defined), 10))
+
+
+def get_files():
+    """Return a list of all files in the current git directory."""
     # use 'git ls-files' to get the worklist
     stdout = execute("git ls-files")
     if len(stdout) > 0 and stdout[-1] == "\n":
         stdout = stdout[:-1]
 
+    files = []
     for gitfile in stdout.rsplit("\n"):
         if ".git" in gitfile or "ChangeLog" in gitfile or      \
                 ".log" in gitfile or os.path.isdir(gitfile) or \
                 gitfile.startswith("tools/"):
             continue
+        files.append(gitfile)
+    return files
+
+
+def check_symbols(ignore):
+    """Find undefined Kconfig symbols and return a dict with the symbol as key
+    and a list of referencing files as value.  Files matching %ignore are not
+    checked for undefined symbols."""
+    pool = Pool(cpu_count(), init_worker)
+    try:
+        return check_symbols_helper(pool, ignore)
+    except KeyboardInterrupt:
+        pool.terminate()
+        pool.join()
+        sys.exit(1)
+
+
+def check_symbols_helper(pool, ignore):
+    """Helper method for check_symbols().  Used to catch keyboard interrupts in
+    check_symbols() in order to properly terminate running worker processes."""
+    source_files = []
+    kconfig_files = []
+    defined_features = []
+    referenced_features = dict()  # {file: [features]}
+
+    for gitfile in get_files():
         if REGEX_FILE_KCONFIG.match(gitfile):
             kconfig_files.append(gitfile)
         else:
-            # all non-Kconfig files are checked for consistency
+            if ignore and not re.match(ignore, gitfile):
+                continue
+            # add source files that do not match the ignore pattern
             source_files.append(gitfile)
 
-    for sfile in source_files:
-        if ignore and re.match(ignore, sfile):
-            # do not check files matching %ignore
-            continue
-        parse_source_file(sfile, referenced_features)
+    # parse source files
+    arglist = partition(source_files, cpu_count())
+    for res in pool.map(parse_source_files, arglist):
+        referenced_features.update(res)
 
-    for kfile in kconfig_files:
-        if ignore and re.match(ignore, kfile):
-            # do not collect references for files matching %ignore
-            parse_kconfig_file(kfile, defined_features, dict())
-        else:
-            parse_kconfig_file(kfile, defined_features, referenced_features)
+
+    # parse kconfig files
+    arglist = []
+    for part in partition(kconfig_files, cpu_count()):
+        arglist.append((part, ignore))
+    for res in pool.map(parse_kconfig_files, arglist):
+        defined_features.extend(res[0])
+        referenced_features.update(res[1])
+    defined_features = set(defined_features)
+
+    # inverse mapping of referenced_features to dict(feature: [files])
+    inv_map = dict()
+    for _file, features in referenced_features.iteritems():
+        for feature in features:
+            inv_map[feature] = inv_map.get(feature, set())
+            inv_map[feature].add(_file)
+    referenced_features = inv_map
 
     undefined = {}  # {feature: [files]}
     for feature in sorted(referenced_features):
@@ -259,12 +358,26 @@ def check_symbols(ignore):
                 if feature[:-len("_MODULE")] in defined_features:
                     continue
             undefined[feature] = referenced_features.get(feature)
-    return undefined
+    return undefined, defined_features
 
 
-def parse_source_file(sfile, referenced_features):
-    """Parse @sfile for referenced Kconfig features."""
+def parse_source_files(source_files):
+    """Parse each source file in @source_files and return dictionary with source
+    files as keys and lists of references Kconfig symbols as values."""
+    referenced_features = dict()
+    for sfile in source_files:
+        referenced_features[sfile] = parse_source_file(sfile)
+    return referenced_features
+
+
+def parse_source_file(sfile):
+    """Parse @sfile and return a list of referenced Kconfig features."""
     lines = []
+    references = []
+
+    if not os.path.exists(sfile):
+        return references
+
     with open(sfile, "r") as stream:
         lines = stream.readlines()
 
@@ -275,9 +388,9 @@ def parse_source_file(sfile, referenced_features):
         for feature in features:
             if not REGEX_FILTER_FEATURES.search(feature):
                 continue
-            sfiles = referenced_features.get(feature, set())
-            sfiles.add(sfile)
-            referenced_features[feature] = sfiles
+            references.append(feature)
+
+    return references
 
 
 def get_features_in_line(line):
@@ -285,11 +398,35 @@ def get_features_in_line(line):
     return REGEX_FEATURE.findall(line)
 
 
-def parse_kconfig_file(kfile, defined_features, referenced_features):
+def parse_kconfig_files(args):
+    """Parse kconfig files and return tuple of defined and references Kconfig
+    symbols.  Note, @args is a tuple of a list of files and the @ignore
+    pattern."""
+    kconfig_files = args[0]
+    ignore = args[1]
+    defined_features = []
+    referenced_features = dict()
+
+    for kfile in kconfig_files:
+        defined, references = parse_kconfig_file(kfile)
+        defined_features.extend(defined)
+        if ignore and re.match(ignore, kfile):
+            # do not collect references for files that match the ignore pattern
+            continue
+        referenced_features[kfile] = references
+    return (defined_features, referenced_features)
+
+
+def parse_kconfig_file(kfile):
     """Parse @kfile and update feature definitions and references."""
     lines = []
+    defined = []
+    references = []
     skip = False
 
+    if not os.path.exists(kfile):
+        return defined, references
+
     with open(kfile, "r") as stream:
         lines = stream.readlines()
 
@@ -300,7 +437,7 @@ def parse_kconfig_file(kfile, defined_features, referenced_features):
 
         if REGEX_KCONFIG_DEF.match(line):
             feature_def = REGEX_KCONFIG_DEF.findall(line)
-            defined_features.add(feature_def[0])
+            defined.append(feature_def[0])
             skip = False
         elif REGEX_KCONFIG_HELP.match(line):
             skip = True
@@ -308,6 +445,7 @@ def parse_kconfig_file(kfile, defined_features, referenced_features):
             # ignore content of help messages
             pass
         elif REGEX_KCONFIG_STMT.match(line):
+            line = REGEX_QUOTES.sub("", line)
             features = get_features_in_line(line)
             # multi-line statements
             while line.endswith("\\"):
@@ -319,9 +457,9 @@ def parse_kconfig_file(kfile, defined_features, referenced_features):
                 if REGEX_NUMERIC.match(feature):
                     # ignore numeric values
                     continue
-                paths = referenced_features.get(feature, set())
-                paths.add(kfile)
-                referenced_features[feature] = paths
+                references.append(feature)
+
+    return defined, references
 
 
 if __name__ == "__main__":
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2b3c22808c3b..0147c91fa549 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -433,6 +433,28 @@ our @typeList = (
         qr{${Ident}_handler_fn},
         @typeListMisordered,
 );
+
+our $C90_int_types = qr{(?x:
+        long\s+long\s+int\s+(?:un)?signed|
+        long\s+long\s+(?:un)?signed\s+int|
+        long\s+long\s+(?:un)?signed|
+        (?:(?:un)?signed\s+)?long\s+long\s+int|
+        (?:(?:un)?signed\s+)?long\s+long|
+        int\s+long\s+long\s+(?:un)?signed|
+        int\s+(?:(?:un)?signed\s+)?long\s+long|
+
+        long\s+int\s+(?:un)?signed|
+        long\s+(?:un)?signed\s+int|
+        long\s+(?:un)?signed|
+        (?:(?:un)?signed\s+)?long\s+int|
+        (?:(?:un)?signed\s+)?long|
+        int\s+long\s+(?:un)?signed|
+        int\s+(?:(?:un)?signed\s+)?long|
+
+        int\s+(?:un)?signed|
+        (?:(?:un)?signed\s+)?int
+)};
+
 our @typeListFile = ();
 our @typeListWithAttr = (
         @typeList,
@@ -4517,7 +4539,7 @@ sub process {
                         #print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
 
                         $has_flow_statement = 1 if ($ctx =~ /\b(goto|return)\b/);
-                        $has_arg_concat = 1 if ($ctx =~ /\#\#/);
+                        $has_arg_concat = 1 if ($ctx =~ /\#\#/ && $ctx !~ /\#\#\s*(?:__VA_ARGS__|args)\b/);
 
                         $dstat =~ s/^.\s*\#\s*define\s+$Ident(?:\([^\)]*\))?\s*//;
                         $dstat =~ s/$;//g;
@@ -4528,7 +4550,7 @@ sub process {
                         # Flatten any parentheses and braces
                         while ($dstat =~ s/\([^\(\)]*\)/1/ ||
                                $dstat =~ s/\{[^\{\}]*\}/1/ ||
-                               $dstat =~ s/\[[^\[\]]*\]/1/)
+                               $dstat =~ s/.\[[^\[\]]*\]/1/)
                         {
                         }
 
@@ -4548,7 +4570,8 @@ sub process {
                                 union|
                                 struct|
                                 \.$Ident\s*=\s*|
-                                ^\"|\"$
+                                ^\"|\"$|
+                                ^\[
                         }x;
                         #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
                         if ($dstat ne '' &&
@@ -5116,13 +5139,44 @@ sub process {
                         }
                 }
 # check for memory barriers without a comment.
-                if ($line =~ /\b(mb|rmb|wmb|read_barrier_depends|smp_mb|smp_rmb|smp_wmb|smp_read_barrier_depends)\(/) {
+
+                my $barriers = qr{
+                        mb|
+                        rmb|
+                        wmb|
+                        read_barrier_depends
+                }x;
+                my $barrier_stems = qr{
+                        mb__before_atomic|
+                        mb__after_atomic|
+                        store_release|
+                        load_acquire|
+                        store_mb|
+                        (?:$barriers)
+                }x;
+                my $all_barriers = qr{
+                        (?:$barriers)|
+                        smp_(?:$barrier_stems)|
+                        virt_(?:$barrier_stems)
+                }x;
+
+                if ($line =~ /\b(?:$all_barriers)\s*\(/) {
                         if (!ctx_has_comment($first_line, $linenr)) {
                                 WARN("MEMORY_BARRIER",
                                      "memory barrier without comment\n" . $herecurr);
                         }
                 }
 
+                my $underscore_smp_barriers = qr{__smp_(?:$barrier_stems)}x;
+
+                if ($realfile !~ m@^include/asm-generic/@ &&
+                    $realfile !~ m@/barrier\.h$@ &&
+                    $line =~ m/\b(?:$underscore_smp_barriers)\s*\(/ &&
+                    $line !~ m/^.\s*\#\s*define\s+(?:$underscore_smp_barriers)\s*\(/) {
+                        WARN("MEMORY_BARRIER",
+                             "__smp memory barriers shouldn't be used outside barrier.h and asm-generic\n" . $herecurr);
+                }
+
 # check for waitqueue_active without a comment.
                 if ($line =~ /\bwaitqueue_active\s*\(/) {
                         if (!ctx_has_comment($first_line, $linenr)) {
@@ -5241,6 +5295,26 @@ sub process {
                         }
                 }
 
+# check for cast of C90 native int or longer types constants
+                if ($line =~ /(\(\s*$C90_int_types\s*\)\s*)($Constant)\b/) {
+                        my $cast = $1;
+                        my $const = $2;
+                        if (WARN("TYPECAST_INT_CONSTANT",
+                                 "Unnecessary typecast of c90 int constant\n" . $herecurr) &&
+                            $fix) {
+                                my $suffix = "";
+                                my $newconst = $const;
+                                $newconst =~ s/${Int_type}$//;
+                                $suffix .= 'U' if ($cast =~ /\bunsigned\b/);
+                                if ($cast =~ /\blong\s+long\b/) {
+                                        $suffix .= 'LL';
+                                } elsif ($cast =~ /\blong\b/) {
+                                        $suffix .= 'L';
+                                }
+                                $fixed[$fixlinenr] =~ s/\Q$cast\E$const\b/$newconst$suffix/;
+                        }
+                }
+
 # check for sizeof(&)
                 if ($line =~ /\bsizeof\s*\(\s*\&/) {
                         WARN("SIZEOF_ADDRESS",
diff --git a/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci b/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci
new file mode 100644
index 000000000000..8fa5a3c7b784
--- /dev/null
+++ b/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci
@@ -0,0 +1,75 @@
+/// Unsigned expressions cannot be lesser than zero. Presence of
+/// comparisons 'unsigned (<|<=|>|>=) 0' often indicates a bug,
+/// usually wrong type of variable.
+///
+/// To reduce number of false positives following tests have been added:
+/// - parts of range checks are skipped, eg. "if (u < 0 || u > 15) ...",
+///   developers prefer to keep such code,
+/// - comparisons "<= 0" and "> 0" are performed only on results of
+///   signed functions/macros,
+/// - hardcoded list of signed functions/macros with always non-negative
+///   result is used to avoid false positives difficult to detect by other ways
+///
+// Confidence: Average
+// Copyright: (C) 2015 Andrzej Hajda, Samsung Electronics Co., Ltd. GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: --all-includes
+
+virtual context
+virtual org
+virtual report
+
+@r_cmp@
+position p;
+typedef bool, u8, u16, u32, u64;
+{unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long,
+        size_t, bool, u8, u16, u32, u64} v;
+expression e;
+@@
+
+        \( v = e \| &v \)
+        ...
+        (\( v@p < 0 \| v@p <= 0 \| v@p >= 0 \| v@p > 0 \))
+
+@r@
+position r_cmp.p;
+typedef s8, s16, s32, s64;
+{char, short, int, long, long long, ssize_t, s8, s16, s32, s64} vs;
+expression c, e, v;
+identifier f !~ "^(ata_id_queue_depth|btrfs_copy_from_user|dma_map_sg|dma_map_sg_attrs|fls|fls64|gameport_time|get_write_extents|nla_len|ntoh24|of_flat_dt_match|of_get_child_count|uart_circ_chars_pending|[A-Z0-9_]+)$";
+@@
+
+(
+        v = f(...)@vs;
+        ... when != v = e;
+*       (\( v@p <=@e 0 \| v@p >@e 0 \))
+        ... when any
+|
+(
+        (\( v@p < 0 \| v@p <= 0 \)) || ... || (\( v >= c \| v > c \))
+|
+        (\( v >= c \| v > c \)) || ... || (\( v@p < 0 \| v@p <= 0 \))
+|
+        (\( v@p >= 0 \| v@p > 0 \)) && ... && (\( v < c \| v <= c \))
+|
+        ((\( v < c \| v <= c \) && ... && \( v@p >= 0 \| v@p > 0 \)))
+|
+*       (\( v@p <@e 0 \| v@p >=@e 0 \))
+)
+)
+
+@script:python depends on org@
+p << r_cmp.p;
+e << r.e;
+@@
+
+msg = "WARNING: Unsigned expression compared with zero: %s" % (e)
+coccilib.org.print_todo(p[0], msg)
+
+@script:python depends on report@
+p << r_cmp.p;
+e << r.e;
+@@
+
+msg = "WARNING: Unsigned expression compared with zero: %s" % (e)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index 88632df4381b..dafaf96e0a34 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -423,13 +423,15 @@ static struct string_list *read_node(FILE *f)
         struct string_list node = {
                 .string = buffer,
                 .tag = SYM_NORMAL };
-        int c;
+        int c, in_string = 0;
 
         while ((c = fgetc(f)) != EOF) {
-                if (c == ' ') {
+                if (!in_string && c == ' ') {
                         if (node.string == buffer)
                                 continue;
                         break;
+                } else if (c == '"') {
+                        in_string = !in_string;
                 } else if (c == '\n') {
                         if (node.string == buffer)
                                 return NULL;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index cab641a12dd5..1873421f2305 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -16,7 +16,9 @@ my $P = $0;
 my $V = '0.26';
 
 use Getopt::Long qw(:config no_auto_abbrev);
+use Cwd;
 
+my $cur_path = fastgetcwd() . '/';
 my $lk_path = "./";
 my $email = 1;
 my $email_usename = 1;
@@ -429,6 +431,8 @@ foreach my $file (@ARGV) {
         }
     }
     if ($from_filename) {
+        $file =~ s/^\Q${cur_path}\E//;  #strip any absolute path
+        $file =~ s/^\Q${lk_path}\E//;   #or the path to the lk tree
         push(@files, $file);
         if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) {
             open(my $f, '<', $file)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 6c204318bc94..866369f10ff8 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -5,6 +5,7 @@
 
 #include <locale.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,7 +42,7 @@ static int tty_stdio;
 static int valid_stdin = 1;
 static int sync_kconfig;
 static int conf_cnt;
-static char line[128];
+static char line[PATH_MAX];
 static struct menu *rootEntry;
 
 static void print_help(struct menu *menu)
@@ -109,7 +110,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
                 /* fall through */
         case oldaskconfig:
                 fflush(stdout);
-                xfgets(line, 128, stdin);
+                xfgets(line, sizeof(line), stdin);
                 if (!tty_stdio)
                         printf("\n");
                 return 1;
@@ -311,7 +312,7 @@ static int conf_choice(struct menu *menu)
                         /* fall through */
                 case oldaskconfig:
                         fflush(stdout);
-                        xfgets(line, 128, stdin);
+                        xfgets(line, sizeof(line), stdin);
                         strip(line);
                         if (line[0] == '?') {
                                 print_help(menu);
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index b05cc3d4a9be..aed678e8a777 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -477,7 +477,7 @@ bool menu_is_visible(struct menu *menu)
 
         if (menu->visibility) {
                 if (expr_calc_value(menu->visibility) == no)
-                        return no;
+                        return false;
         }
 
         sym = menu->sym;
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 91b7e6fbc364..fc5555992220 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1863,6 +1863,8 @@ int main(int ac, char** av)
 
         configSettings->endGroup();
         delete configSettings;
+        delete v;
+        delete configApp;
 
         return 0;
 }
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 125b906cd1d4..c37255bb620d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1816,6 +1816,8 @@ sub dump_struct($$) {
         $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
         $members =~ s/__aligned\s*\([^;]*\)//gos;
         $members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos;
+        # replace DECLARE_BITMAP
+        $members =~ s/DECLARE_BITMAP\s*\(([^,)]+), ([^,)]+)\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos;
 
         create_parameterlist($members, ';', $file);
         check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
@@ -1844,7 +1846,8 @@ sub dump_enum($$) {
     my $file = shift;
 
     $x =~ s@/\*.*?\*/@@gos;     # strip comments.
-    $x =~ s/^#\s*define\s+.*$//; # strip #define macros inside enums
+    # strip #define macros inside enums
+    $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
 
     if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
         $declaration_name = $1;
@@ -2711,7 +2714,7 @@ $kernelversion = get_kernel_version();
 
 # generate a sequence of code that will splice in highlighting information
 # using the s// operator.
-foreach my $k (keys @highlights) {
+for (my $k = 0; $k < @highlights; $k++) {
     my $pattern = $highlights[$k][0];
     my $result = $highlights[$k][1];
 #   print STDERR "scanning pattern:$pattern, highlight:($result)\n";
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
index 198580d245e0..d154f0877fd8 100755
--- a/scripts/ld-version.sh
+++ b/scripts/ld-version.sh
@@ -2,7 +2,9 @@
 # extract linker version number from stdin and turn into single number
         {
         gsub(".*)", "");
+        gsub(".*version ", "");
+        gsub("-.*", "");
         split($1,a, ".");
-        print a[1]*10000000 + a[2]*100000 + a[3]*10000 + a[4]*100 + a[5];
+        print a[1]*100000000 + a[2]*1000000 + a[3]*10000 + a[4]*100 + a[5];
         exit
         }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 1a10d8ac8162..ba6c34ea5429 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -62,7 +62,7 @@ vmlinux_link()
                         -Wl,--start-group                                    \
                                  ${KBUILD_VMLINUX_MAIN}                      \
                         -Wl,--end-group                                      \
-                        -lutil ${1}
+                        -lutil -lrt -lpthread ${1}
                 rm -f linux
         fi
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5b96206e9aab..161dd0d67da8 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -125,7 +125,7 @@ do {                                                            \
                 sprintf(str + strlen(str), "*");                \
 } while(0)
 
-/* Always end in a wildcard, for future extension */
+/* End in a wildcard, for future extension */
 static inline void add_wildcard(char *str)
 {
         int len = strlen(str);
@@ -704,7 +704,6 @@ static int do_of_entry (const char *filename, void *symval, char *alias)
                 if (isspace (*tmp))
                         *tmp = '_';
 
-        add_wildcard(alias);
         return 1;
 }
 ADD_TO_DEVTABLE("of", of_device_id, do_of_entry);
@@ -917,7 +916,7 @@ static int do_vmbus_entry(const char *filename, void *symval,
         char guid_name[(sizeof(*guid) + 1) * 2];
 
         for (i = 0; i < (sizeof(*guid) * 2); i += 2)
-                sprintf(&guid_name[i], "%02x", TO_NATIVE((*guid)[i/2]));
+                sprintf(&guid_name[i], "%02x", TO_NATIVE((guid->b)[i/2]));
 
         strcpy(alias, "vmbus:");
         strcat(alias, guid_name);
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index e080746e1a6b..48958d3cec9e 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -594,7 +594,8 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname)
                 if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
                     strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0 ||
                     strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
-                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0)
+                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0 ||
+                    strcmp(symname, ".TOC.") == 0)
                         return 1;
         /* Do not ignore this symbol */
         return 0;
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 1aca224e8597..c2c7389bfbab 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -118,12 +118,12 @@ quiet_cmd_perf_tar = TAR
       cmd_perf_tar = \
 git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/         \
         HEAD^{tree} $$(cd $(srctree);                               \
-                       echo $$(cat $(srctree)/tools/perf/MANIFEST)) \
+                       echo $$(cat tools/perf/MANIFEST)) \
         -o $(perf-tar).tar;                                         \
 mkdir -p $(perf-tar);                                               \
 git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD;    \
 (cd $(srctree)/tools/perf;                                          \
-util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null);              \
+util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/);              \
 tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
 rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 698768bdc581..e167592793a7 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -48,12 +48,17 @@
 
 static int fd_map;      /* File descriptor for file being modified. */
 static int mmap_failed; /* Boolean flag. */
-static void *ehdr_curr; /* current ElfXX_Ehdr *  for resource cleanup */
 static char gpfx;       /* prefix for global symbol name (sometimes '_') */
 static struct stat sb;  /* Remember .st_size, etc. */
 static jmp_buf jmpenv;  /* setjmp/longjmp per-file error escape */
 static const char *altmcount;   /* alternate mcount symbol name */
 static int warn_on_notrace_sect; /* warn when section has mcount not being recorded */
+static void *file_map;  /* pointer of the mapped file */
+static void *file_end;  /* pointer to the end of the mapped file */
+static int file_updated; /* flag to state file was changed */
+static void *file_ptr;  /* current file pointer location */
+static void *file_append; /* added to the end of the file */
+static size_t file_append_size; /* how much is added to end of file */
 
 /* setjmp() return values */
 enum {
@@ -67,10 +72,14 @@ static void
 cleanup(void)
 {
         if (!mmap_failed)
-                munmap(ehdr_curr, sb.st_size);
+                munmap(file_map, sb.st_size);
         else
-                free(ehdr_curr);
-        close(fd_map);
+                free(file_map);
+        file_map = NULL;
+        free(file_append);
+        file_append = NULL;
+        file_append_size = 0;
+        file_updated = 0;
 }
 
 static void __attribute__((noreturn))
@@ -92,12 +101,22 @@ succeed_file(void)
 static off_t
 ulseek(int const fd, off_t const offset, int const whence)
 {
-        off_t const w = lseek(fd, offset, whence);
-        if (w == (off_t)-1) {
-                perror("lseek");
+        switch (whence) {
+        case SEEK_SET:
+                file_ptr = file_map + offset;
+                break;
+        case SEEK_CUR:
+                file_ptr += offset;
+                break;
+        case SEEK_END:
+                file_ptr = file_map + (sb.st_size - offset);
+                break;
+        }
+        if (file_ptr < file_map) {
+                fprintf(stderr, "lseek: seek before file\n");
                 fail_file();
         }
-        return w;
+        return file_ptr - file_map;
 }
 
 static size_t
@@ -114,12 +133,38 @@ uread(int const fd, void *const buf, size_t const count)
 static size_t
 uwrite(int const fd, void const *const buf, size_t const count)
 {
-        size_t const n = write(fd, buf, count);
-        if (n != count) {
-                perror("write");
-                fail_file();
+        size_t cnt = count;
+        off_t idx = 0;
+
+        file_updated = 1;
+
+        if (file_ptr + count >= file_end) {
+                off_t aoffset = (file_ptr + count) - file_end;
+
+                if (aoffset > file_append_size) {
+                        file_append = realloc(file_append, aoffset);
+                        file_append_size = aoffset;
+                }
+                if (!file_append) {
+                        perror("write");
+                        fail_file();
+                }
+                if (file_ptr < file_end) {
+                        cnt = file_end - file_ptr;
+                } else {
+                        cnt = 0;
+                        idx = aoffset - count;
+                }
         }
-        return n;
+
+        if (cnt)
+                memcpy(file_ptr, buf, cnt);
+
+        if (cnt < count)
+                memcpy(file_append + idx, buf + cnt, count - cnt);
+
+        file_ptr += count;
+        return count;
 }
 
 static void *
@@ -192,9 +237,7 @@ static int make_nop_arm64(void *map, size_t const offset)
  */
 static void *mmap_file(char const *fname)
 {
-        void *addr;
-
-        fd_map = open(fname, O_RDWR);
+        fd_map = open(fname, O_RDONLY);
         if (fd_map < 0 || fstat(fd_map, &sb) < 0) {
                 perror(fname);
                 fail_file();
@@ -203,15 +246,58 @@ static void *mmap_file(char const *fname)
                 fprintf(stderr, "not a regular file: %s\n", fname);
                 fail_file();
         }
-        addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE,
-                    fd_map, 0);
+        file_map = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE,
+                        fd_map, 0);
         mmap_failed = 0;
-        if (addr == MAP_FAILED) {
+        if (file_map == MAP_FAILED) {
                 mmap_failed = 1;
-                addr = umalloc(sb.st_size);
-                uread(fd_map, addr, sb.st_size);
+                file_map = umalloc(sb.st_size);
+                uread(fd_map, file_map, sb.st_size);
+        }
+        close(fd_map);
+
+        file_end = file_map + sb.st_size;
+
+        return file_map;
+}
+
+static void write_file(const char *fname)
+{
+        char tmp_file[strlen(fname) + 4];
+        size_t n;
+
+        if (!file_updated)
+                return;
+
+        sprintf(tmp_file, "%s.rc", fname);
+
+        /*
+         * After reading the entire file into memory, delete it
+         * and write it back, to prevent weird side effects of modifying
+         * an object file in place.
+         */
+        fd_map = open(tmp_file, O_WRONLY | O_TRUNC | O_CREAT, sb.st_mode);
+        if (fd_map < 0) {
+                perror(fname);
+                fail_file();
+        }
+        n = write(fd_map, file_map, sb.st_size);
+        if (n != sb.st_size) {
+                perror("write");
+                fail_file();
+        }
+        if (file_append_size) {
+                n = write(fd_map, file_append, file_append_size);
+                if (n != file_append_size) {
+                        perror("write");
+                        fail_file();
+                }
+        }
+        close(fd_map);
+        if (rename(tmp_file, fname) < 0) {
+                perror(fname);
+                fail_file();
         }
-        return addr;
 }
 
 /* w8rev, w8nat, ...: Handle endianness. */
@@ -318,7 +404,6 @@ do_file(char const *const fname)
         Elf32_Ehdr *const ehdr = mmap_file(fname);
         unsigned int reltype = 0;
 
-        ehdr_curr = ehdr;
         w = w4nat;
         w2 = w2nat;
         w8 = w8nat;
@@ -441,6 +526,7 @@ do_file(char const *const fname)
         }
         }  /* end switch */
 
+        write_file(fname);
         cleanup();
 }
 
@@ -493,11 +579,14 @@ main(int argc, char *argv[])
                 case SJ_SETJMP:    /* normal sequence */
                         /* Avoid problems if early cleanup() */
                         fd_map = -1;
-                        ehdr_curr = NULL;
                         mmap_failed = 1;
+                        file_map = NULL;
+                        file_ptr = NULL;
+                        file_updated = 0;
                         do_file(file);
                         break;
                 case SJ_FAIL:    /* error in do_file or below */
+                        fprintf(stderr, "%s: failed\n", file);
                         ++n_error;
                         break;
                 case SJ_SUCCEED:    /* premature success */
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 826470d7f000..96e2486a6fc4 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -263,7 +263,8 @@ if ($arch eq "x86_64") {
 
 } elsif ($arch eq "powerpc") {
     $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";
-    $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?.*?)>:";
+    # See comment in the sparc64 section for why we use '\w'.
+    $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?\\w*?)>:";
     $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s\\.?_mcount\$";
 
     if ($bits == 64) {
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 262889046703..23ba1c6a0a59 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generate tags or cscope files
 # Usage tags.sh <mode>
 #
@@ -134,11 +134,6 @@ all_kconfigs()
         find_other_sources 'Kconfig*'
 }
 
-all_defconfigs()
-{
-        find_sources $ALLSOURCE_ARCHS "defconfig"
-}
-
 docscope()
 {
         (echo \-k; echo \-q; all_target_sources) > cscope.files
@@ -150,8 +145,107 @@ dogtags()
         all_target_sources | gtags -i -f -
 }
 
+# Basic regular expressions with an optional /kind-spec/ for ctags and
+# the following limitations:
+# - No regex modifiers
+# - Use \{0,1\} instead of \?, because etags expects an unescaped ?
+# - \s is not working with etags, use a space or [ \t]
+# - \w works, but does not match underscores in etags
+# - etags regular expressions have to match at the start of a line;
+#   a ^[^#] is prepended by setup_regex unless an anchor is already present
+regex_asm=(
+        '/^\(ENTRY\|_GLOBAL\)(\([[:alnum:]_\\]*\)).*/\2/'
+)
+regex_c=(
+        '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+        '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
+        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
+        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+        '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1/'
+        '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/^TESTSETFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+        '/^TESTPAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+        '/^SETPAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/\<__SETPAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+        '/\<TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<__TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<CLEARPAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/\<__CLEARPAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+        '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/^PAGEFLAG_FALSE(\([[:alnum:]_]*\).*/Page\1/'
+        '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+        '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<SETPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/\<CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/\<__CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/\<TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/^TASK_PFA_TEST([^,]*, *\([[:alnum:]_]*\))/task_\1/'
+        '/^TASK_PFA_SET([^,]*, *\([[:alnum:]_]*\))/task_set_\1/'
+        '/^TASK_PFA_CLEAR([^,]*, *\([[:alnum:]_]*\))/task_clear_\1/'
+        '/^DEF_MMIO_\(IN\|OUT\)_[XD](\([[:alnum:]_]*\),[^)]*)/\2/'
+        '/^DEBUGGER_BOILERPLATE(\([[:alnum:]_]*\))/\1/'
+        '/^DEF_PCI_AC_\(\|NO\)RET(\([[:alnum:]_]*\).*/\2/'
+        '/^PCI_OP_READ(\(\w*\).*[1-4])/pci_bus_read_config_\1/'
+        '/^PCI_OP_WRITE(\(\w*\).*[1-4])/pci_bus_write_config_\1/'
+        '/\<DEFINE_\(MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DECLARE_\(RWSEM\|COMPLETION\)(\([[:alnum:]_]\+\)/\2/v/'
+        '/\<DECLARE_BITMAP(\([[:alnum:]_]*\)/\1/v/'
+        '/\(^\|\s\)\(\|L\|H\)LIST_HEAD(\([[:alnum:]_]*\)/\3/v/'
+        '/\(^\|\s\)RADIX_TREE(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_PER_CPU([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+        '/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+        '/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
+        '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
+        '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
+        '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
+)
+regex_kconfig=(
+        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
+        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/CONFIG_\2/'
+)
+setup_regex()
+{
+        local mode=$1 lang tmp=() r
+        shift
+
+        regex=()
+        for lang; do
+                case "$lang" in
+                asm)       tmp=("${regex_asm[@]}") ;;
+                c)         tmp=("${regex_c[@]}") ;;
+                kconfig)   tmp=("${regex_kconfig[@]}") ;;
+                esac
+                for r in "${tmp[@]}"; do
+                        if test "$mode" = "exuberant"; then
+                                regex[${#regex[@]}]="--regex-$lang=${r}b"
+                        else
+                                # Remove ctags /kind-spec/
+                                case "$r" in
+                                /*/*/?/)
+                                        r=${r%?/}
+                                esac
+                                # Prepend ^[^#] unless already anchored
+                                case "$r" in
+                                /^*) ;;
+                                *)
+                                        r="/^[^#]*${r#/}"
+                                esac
+                                regex[${#regex[@]}]="--regex=$r"
+                        fi
+                done
+        done
+}
+
 exuberant()
 {
+        setup_regex exuberant asm c
         all_target_sources | xargs $1 -a                        \
         -I __initdata,__exitdata,__initconst,                   \
         -I __initdata_memblock                                  \
@@ -165,118 +259,21 @@ exuberant()
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL,ACPI_EXPORT_SYMBOL   \
         -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
         -I static,const                                         \
-        --extra=+f --c-kinds=+px                                \
-        --regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \
-        --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
-        --regex-c='/^COMPAT_SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/compat_sys_\1/' \
-        --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
-        --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1_rcuidle/'       \
-        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'     \
-        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1_rcuidle/' \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/Page\1/'                     \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/SetPage\1/'                  \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'                \
-        --regex-c++='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'           \
-        --regex-c++='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'                 \
-        --regex-c++='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'               \
-        --regex-c++='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'           \
-        --regex-c++='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'       \
-        --regex-c++='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'     \
-        --regex-c++='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'           \
-        --regex-c++='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'       \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'              \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'            \
-        --regex-c++='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'               \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'            \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'          \
-        --regex-c++='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'          \
-        --regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'      \
-        --regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/'  \
-        --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-        --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
-        --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
-        --regex-c++='/TASK_PFA_TEST\([^,]*,\s*([^)]*)\)/task_\1/'       \
-        --regex-c++='/TASK_PFA_SET\([^,]*,\s*([^)]*)\)/task_set_\1/'    \
-        --regex-c++='/TASK_PFA_CLEAR\([^,]*,\s*([^)]*)\)/task_clear_\1/'\
-        --regex-c++='/DEF_MMIO_(IN|OUT)_(X|D)\(([^,]*),\s*[^)]*\)/\3/'  \
-        --regex-c++='/DEBUGGER_BOILERPLATE\(([^,]*)\)/\1/'              \
-        --regex-c='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/' \
-        --regex-c='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/' \
-        --regex-c='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'     \
-        --regex-c='/DEFINE_(RAW_SPINLOCK|RWLOCK|SEQLOCK)\((\w*)/\2/v/'  \
-        --regex-c='/DECLARE_(RWSEM|COMPLETION)\((\w*)/\2/v/'            \
-        --regex-c='/DECLARE_BITMAP\((\w*)/\1/v/'                        \
-        --regex-c='/(^|\s)(|L|H)LIST_HEAD\((\w*)/\3/v/'                 \
-        --regex-c='/(^|\s)RADIX_TREE\((\w*)/\2/v/'                      \
-        --regex-c='/DEFINE_PER_CPU\(([^,]*,\s*)(\w*).*\)/\2/v/'         \
-        --regex-c='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \
-        --regex-c='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/'               \
-        --regex-c='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/'   \
-        --regex-c='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/'               \
-        --regex-c='/(^\s)OFFSET\((\w*)/\2/v/'                           \
-        --regex-c='/(^\s)DEFINE\((\w*)/\2/v/'                           \
-        --regex-c='/DEFINE_HASHTABLE\((\w*)/\1/v/'
+        --extra=+f --c-kinds=+px --langmap=c:+.h "${regex[@]}"
 
+        setup_regex exuberant kconfig
         all_kconfigs | xargs $1 -a                              \
-        --langdef=kconfig --language-force=kconfig              \
-        --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'
+        --langdef=kconfig --language-force=kconfig "${regex[@]}"
 
-        all_kconfigs | xargs $1 -a                              \
-        --langdef=kconfig --language-force=kconfig              \
-        --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/CONFIG_\2/'
-
-        all_defconfigs | xargs -r $1 -a                         \
-        --langdef=dotconfig --language-force=dotconfig          \
-        --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
 }
 
 emacs()
 {
-        all_target_sources | xargs $1 -a                        \
-        --regex='/^\(ENTRY\|_GLOBAL\)(\([^)]*\)).*/\2/'         \
-        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
-        --regex='/^COMPAT_SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/compat_sys_\1/' \
-        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
-        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1_rcuidle/'  \
-        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
-        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1_rcuidle/' \
-        --regex='/PAGEFLAG(\([^,)]*\).*/Page\1/'                        \
-        --regex='/PAGEFLAG(\([^,)]*\).*/SetPage\1/'             \
-        --regex='/PAGEFLAG(\([^,)]*\).*/ClearPage\1/'           \
-        --regex='/TESTSETFLAG(\([^,)]*\).*/TestSetPage\1/'      \
-        --regex='/TESTPAGEFLAG(\([^,)]*\).*/Page\1/'            \
-        --regex='/SETPAGEFLAG(\([^,)]*\).*/SetPage\1/'          \
-        --regex='/__SETPAGEFLAG(\([^,)]*\).*/__SetPage\1/'      \
-        --regex='/TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'  \
-        --regex='/__TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'        \
-        --regex='/CLEARPAGEFLAG(\([^,)]*\).*/ClearPage\1/'      \
-        --regex='/__CLEARPAGEFLAG(\([^,)]*\).*/__ClearPage\1/'  \
-        --regex='/__PAGEFLAG(\([^,)]*\).*/__SetPage\1/'         \
-        --regex='/__PAGEFLAG(\([^,)]*\).*/__ClearPage\1/'       \
-        --regex='/PAGEFLAG_FALSE(\([^,)]*\).*/Page\1/'          \
-        --regex='/TESTSCFLAG(\([^,)]*\).*/TestSetPage\1/'       \
-        --regex='/TESTSCFLAG(\([^,)]*\).*/TestClearPage\1/'     \
-        --regex='/SETPAGEFLAG_NOOP(\([^,)]*\).*/SetPage\1/'     \
-        --regex='/CLEARPAGEFLAG_NOOP(\([^,)]*\).*/ClearPage\1/' \
-        --regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
-        --regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
-        --regex='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\1/' \
-        --regex='/TASK_PFA_TEST\([^,]*,\s*([^)]*)\)/task_\1/'           \
-        --regex='/TASK_PFA_SET\([^,]*,\s*([^)]*)\)/task_set_\1/'        \
-        --regex='/TASK_PFA_CLEAR\([^,]*,\s*([^)]*)\)/task_clear_\1/'    \
-        --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'           \
-        --regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
-        --regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'\
-        --regex='/[^#]*DEFINE_HASHTABLE(\([^,)]*\)/\1/'
-
-        all_kconfigs | xargs $1 -a                              \
-        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
-
-        all_kconfigs | xargs $1 -a                              \
-        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/CONFIG_\3/'
+        setup_regex emacs asm c
+        all_target_sources | xargs $1 -a "${regex[@]}"
 
-        all_defconfigs | xargs -r $1 -a                         \
-        --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'
+        setup_regex emacs kconfig
+        all_kconfigs | xargs $1 -a "${regex[@]}"
 }
 
 xtags()