27 files changed, 94 insertions, 91 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index c9a16abacab4..291228e25984 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -309,12 +309,18 @@ static void do_config_file(const char *filename)
        close(fd);
 }
+/*
+ * Important: The below generated source_foo.o and deps_foo.o variable
+ * assignments are parsed not only by make, but also by the rather simple
+ * parser in scripts/mod/sumversion.c.
+ */
 static void parse_dep_file(void *map, size_t len)
 {
        char *m = map;
        char *end = m + len;
        char *p;
        char s[PATH_MAX];
+        int first;
        p = strchr(m, ':');
        if (!p) {
@@ -322,11 +328,11 @@ static void parse_dep_file(void *map, size_t len)
                exit(1);
        }
        memcpy(s, m, p-m); s[p-m] = 0;
-        printf("deps_%s := \\\n", target);
        m = p+1;
        clear_config();
+        first = 1;
        while (m < end) {
                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
                        m++;
@@ -340,9 +346,20 @@ static void parse_dep_file(void *map, size_t len)
                if (strrcmp(s, "include/generated/autoconf.h") &&
                    strrcmp(s, "arch/um/include/uml-config.h") &&
                    strrcmp(s, ".ver")) {
-                        printf("  %s \\\n", s);
+                        /*
+                         * Do not list the source file as dependency, so that
+                         * kbuild is not confused if a .c file is rewritten
+                         * into .S or vice versa. Storing it in source_* is
+                         * needed for modpost to compute srcversions.
+                         */
+                        if (first) {
+                                printf("source_%s := %s\n\n", target, s);
+                                printf("deps_%s := \\\n", target);
+                        } else
+                                printf("  %s \\\n", s);
                        do_config_file(s);
                }
+                first = 0;
                m = p + 1;
        }
        printf("\n%s: $(deps_%s)\n\n", target, target);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4c0383da1c9a..58848e3e392c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2654,11 +2654,6 @@ sub process {
                        WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
                }
-# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated
-                if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) {
-                        ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr);
-                }
 # warn about #if 0
                if ($line =~ /^.\s*\#\s*if\s+0\b/) {
                        CHK("if this code is redundant consider removing it\n" .
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index 1512c0a755ac..e1862429ccda 100755
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -56,10 +56,11 @@ trap "rm -f $tmp1 $tmp2" 0
 dump_config "$img"
 # That didn't work, so retry after decompression.
-try_decompress '\037\213\010' xy  gunzip
+try_decompress '\037\213\010' xy    gunzip
-try_decompress 'BZh'          xy  bunzip2
+try_decompress '\3757zXZ\000' abcde unxz
-try_decompress '\135\0\0\0'   xxx unlzma
+try_decompress 'BZh'          xy    bunzip2
-try_decompress '\211\114\132' xy  'lzop -d'
+try_decompress '\135\0\0\0'   xxx   unlzma
+try_decompress '\211\114\132' xy    'lzop -d'
 # Bail out:
 echo "$me: Cannot find kernel config." >&2
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index fd81fc33d633..a4fe923c0131 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copywrite 2005-2009 - Steven Rostedt
+# Copyright 2005-2009 - Steven Rostedt
 # Licensed under the terms of the GNU GPL License version 2
 #
 #  It's simple enough to figure out how this works.
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index ecf9c7dc1825..9dfcd6d988da 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -300,8 +300,8 @@ static int is_static_library(const char *objfile)
                return 0;
 }
-/* We have dir/file.o.  Open dir/.file.o.cmd, look for deps_ line to
+/* We have dir/file.o.  Open dir/.file.o.cmd, look for source_ and deps_ line
- * figure out source file. */
+ * to figure out source files. */
 static int parse_source_files(const char *objfile, struct md4_ctx *md)
 {
        char *cmd, *file, *line, *dir;
@@ -340,6 +340,21 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
        */
        while ((line = get_next_line(&pos, file, flen)) != NULL) {
                char* p = line;
+                if (strncmp(line, "source_", sizeof("source_")-1) == 0) {
+                        p = strrchr(line, ' ');
+                        if (!p) {
+                                warn("malformed line: %s\n", line);
+                                goto out_file;
+                        }
+                        p++;
+                        if (!parse_file(p, md)) {
+                                warn("could not open %s: %s\n",
+                                     p, strerror(errno));
+                                goto out_file;
+                        }
+                        continue;
+                }
                if (strncmp(line, "deps_", sizeof("deps_")-1) == 0) {
                        check_files = 1;
                        continue;
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d0b931b994fc..a834b935f536 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -127,7 +127,8 @@ rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
 $(if $(findstring bz2,$@),bzip2,                                    \
 $(if $(findstring gz,$@),gzip,                                      \
-$(error unknown target $@)))                                       \
+$(if $(findstring xz,$@),xz,                                        \
+$(error unknown target $@))))                                       \
        -f -9 $(perf-tar).tar)
 perf-%pkg: FORCE
@@ -142,7 +143,9 @@ help: FORCE
        @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
        @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
+        @echo '  tarxz-pkg           - Build the kernel as a xz compressed tarball'
        @echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'
        @echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
        @echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
+        @echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b0b2357aef42..f6cbc3ddb68b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -238,12 +238,12 @@ EOF
 fi
 # Build header package
-find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$
+(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
-find arch/x86/include include scripts -type f >> /tmp/files$$
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
 (cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-tar -c -f - -T /tmp/files$$ | (cd $destdir; tar -xf -)
+(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
 (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
 rm -f /tmp/files$$ /tmp/objfiles$$
 arch=$(dpkg --print-architecture)
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 51b2aa0acb82..83c9c04102f2 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -35,6 +35,10 @@ case "${1}" in
                compress="bzip2 -c9"
                file_ext=".bz2"
                ;;
+        tarxz-pkg)
+                compress="xz -c9"
+                file_ext=".xz"
+                ;;
        *)
                echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
                exit 1
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 038b3d1e2981..f9f6f52db772 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -206,7 +206,8 @@ static uint32_t (*w2)(uint16_t);
 static int
 is_mcounted_section_name(char const *const txtname)
 {
-        return 0 == strcmp(".text",          txtname) ||
+        return 0 == strcmp(".text",           txtname) ||
+                0 == strcmp(".ref.text",      txtname) ||
                0 == strcmp(".sched.text",    txtname) ||
                0 == strcmp(".spinlock.text", txtname) ||
                0 == strcmp(".irqentry.text", txtname) ||
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 1d7963f4ee79..4be0deea71ca 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -130,6 +130,7 @@ if ($inputfile =~ m,kernel/trace/ftrace\.o$,) {
 # Acceptable sections to record.
 my %text_sections = (
     ".text" => 1,
+     ".ref.text" => 1,
     ".sched.text" => 1,
     ".spinlock.text" => 1,
     ".irqentry.text" => 1,
diff --git a/scripts/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py
index 44423b4dcb82..8c81d76959ee 100644
--- a/scripts/rt-tester/rt-tester.py
+++ b/scripts/rt-tester/rt-tester.py
@@ -33,8 +33,6 @@ cmd_opcodes = {
    "lockintnowait" : "6",
    "lockcont"      : "7",
    "unlock"        : "8",
-    "lockbkl"       : "9",
-    "unlockbkl"     : "10",
    "signal"        : "11",
    "resetevent"    : "98",
    "reset"         : "99",
diff --git a/scripts/rt-tester/t2-l1-2rt-sameprio.tst b/scripts/rt-tester/t2-l1-2rt-sameprio.tst
index 8821f27cc8be..3710c8b2090d 100644
--- a/scripts/rt-tester/t2-l1-2rt-sameprio.tst
+++ b/scripts/rt-tester/t2-l1-2rt-sameprio.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        0
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t2-l1-pi.tst b/scripts/rt-tester/t2-l1-pi.tst
index cde1f189a02b..b4cc95975adb 100644
--- a/scripts/rt-tester/t2-l1-pi.tst
+++ b/scripts/rt-tester/t2-l1-pi.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        0
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t2-l1-signal.tst b/scripts/rt-tester/t2-l1-signal.tst
index 3ab0bfc49950..1b57376cc1f7 100644
--- a/scripts/rt-tester/t2-l1-signal.tst
+++ b/scripts/rt-tester/t2-l1-signal.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        0
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t2-l2-2rt-deadlock.tst b/scripts/rt-tester/t2-l2-2rt-deadlock.tst
index f4b5d5d6215f..68b10629b6f4 100644
--- a/scripts/rt-tester/t2-l2-2rt-deadlock.tst
+++ b/scripts/rt-tester/t2-l2-2rt-deadlock.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        0
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l1-pi-1rt.tst b/scripts/rt-tester/t3-l1-pi-1rt.tst
index 63440ca2cce9..8e6c8b11ae56 100644
--- a/scripts/rt-tester/t3-l1-pi-1rt.tst
+++ b/scripts/rt-tester/t3-l1-pi-1rt.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l1-pi-2rt.tst b/scripts/rt-tester/t3-l1-pi-2rt.tst
index e5816fe67df3..69c2212fc520 100644
--- a/scripts/rt-tester/t3-l1-pi-2rt.tst
+++ b/scripts/rt-tester/t3-l1-pi-2rt.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l1-pi-3rt.tst b/scripts/rt-tester/t3-l1-pi-3rt.tst
index 718b82b5d3bb..9b0f1eb26a88 100644
--- a/scripts/rt-tester/t3-l1-pi-3rt.tst
+++ b/scripts/rt-tester/t3-l1-pi-3rt.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l1-pi-signal.tst b/scripts/rt-tester/t3-l1-pi-signal.tst
index c6e213563498..39ec74ab06ee 100644
--- a/scripts/rt-tester/t3-l1-pi-signal.tst
+++ b/scripts/rt-tester/t3-l1-pi-signal.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l1-pi-steal.tst b/scripts/rt-tester/t3-l1-pi-steal.tst
index f53749d59d79..e03db7e010fa 100644
--- a/scripts/rt-tester/t3-l1-pi-steal.tst
+++ b/scripts/rt-tester/t3-l1-pi-steal.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t3-l2-pi.tst b/scripts/rt-tester/t3-l2-pi.tst
index cdc3e4fd7bac..7b59100d3e48 100644
--- a/scripts/rt-tester/t3-l2-pi.tst
+++ b/scripts/rt-tester/t3-l2-pi.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t4-l2-pi-deboost.tst b/scripts/rt-tester/t4-l2-pi-deboost.tst
index baa14137f473..2f0e049d6443 100644
--- a/scripts/rt-tester/t4-l2-pi-deboost.tst
+++ b/scripts/rt-tester/t4-l2-pi-deboost.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst b/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst
index e6ec0c81b54d..04f4034ff895 100644
--- a/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst
+++ b/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/rt-tester/t5-l4-pi-boost-deboost.tst b/scripts/rt-tester/t5-l4-pi-boost-deboost.tst
index ca64f8bbf4bc..a48a6ee29ddc 100644
--- a/scripts/rt-tester/t5-l4-pi-boost-deboost.tst
+++ b/scripts/rt-tester/t5-l4-pi-boost-deboost.tst
@@ -19,8 +19,6 @@
 # lockintnowait lock nr (0-7)
 # lockcont      lock nr (0-7)
 # unlock        lock nr (0-7)
-# lockbkl       lock nr (0-7)
-# unlockbkl     lock nr (0-7)
 # signal        thread to signal (0-7)
 # reset         0
 # resetevent    0
@@ -39,9 +37,6 @@
 # blocked       lock nr (0-7)
 # blockedwake   lock nr (0-7)
 # unlocked      lock nr (0-7)
-# lockedbkl     dont care
-# blockedbkl    dont care
-# unlockedbkl   dont care
 # opcodeeq      command opcode or number
 # opcodelt      number
 # opcodegt      number
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 58a12c278706..539855ff31f9 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -43,6 +43,8 @@ int main(int argc, char *argv[])
        int i, j, k;
        int isids_len;
        FILE *fout;
+        const char *needle = "SOCKET";
+        char *substr;
        progname = argv[0];
@@ -88,6 +90,24 @@ int main(int argc, char *argv[])
                fprintf(fout, "%2d\n", i);
        }
        fprintf(fout, "\n#define SECINITSID_NUM %d\n", i-1);
+        fprintf(fout, "\nstatic inline bool security_is_socket_class(u16 kern_tclass)\n");
+        fprintf(fout, "{\n");
+        fprintf(fout, "\tbool sock = false;\n\n");
+        fprintf(fout, "\tswitch (kern_tclass) {\n");
+        for (i = 0; secclass_map[i].name; i++) {
+                struct security_class_mapping *map = &secclass_map[i];
+                substr = strstr(map->name, needle);
+                if (substr && strcmp(substr, needle) == 0)
+                        fprintf(fout, "\tcase SECCLASS_%s:\n", map->name);
+        }
+        fprintf(fout, "\t\tsock = true;\n");
+        fprintf(fout, "\t\tbreak;\n");
+        fprintf(fout, "\tdefault:\n");
+        fprintf(fout, "\t\tbreak;\n");
+        fprintf(fout, "\t}\n\n");
+        fprintf(fout, "\treturn sock;\n");
+        fprintf(fout, "}\n");
        fprintf(fout, "\n#endif\n");
        fclose(fout);
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index ef8729f48586..4d403844e137 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -86,12 +86,16 @@ scm_version()
        # Check for mercurial and a mercurial repo.
        if test -d .hg && hgid=`hg id 2>/dev/null`; then
-                tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
+                # Do we have an tagged version?  If so, latesttagdistance == 1
+                if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then
-                # Do we have an untagged version?
+                        id=`hg log -r . --template '{latesttag}'`
-                if [ -z "$tag" -o "$tag" = tip ]; then
-                        id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
                        printf '%s%s' -hg "$id"
+                else
+                        tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+                        if [ -z "$tag" -o "$tag" = tip ]; then
+                                id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
+                                printf '%s%s' -hg "$id"
+                        fi
                fi
                # Are there uncommitted changes?
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 92fdc4546141..bd6185d529cf 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -114,6 +114,11 @@ docscope()
        cscope -b -f cscope.out
 }
+dogtags()
+{
+        all_sources | gtags -f -
+}
 exuberant()
 {
        all_sources | xargs $1 -a                               \
@@ -187,6 +192,10 @@ case "$1" in
                docscope
                ;;
+        "gtags")
+                dogtags
+                ;;
        "tags")
                rm -f tags
                xtags ctags