17 files changed, 906 insertions, 22 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 105b21f08185..65f362d931b5 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -9,3 +9,4 @@ unifdef
 ihex2fw
 recordmcount
 docproc
+sortextable
diff --git a/scripts/Makefile b/scripts/Makefile
index df7678febf27..a55b0067758a 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,11 +8,16 @@
 # conmakehash:   Create arrays for initializing the kernel console tables
 # docproc:       Used in Documentation/DocBook
 
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include
+
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
 hostprogs-$(CONFIG_IKCONFIG)     += bin2c
 hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
+hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
+
+HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 
 always          := $(hostprogs-y) $(hostprogs-m)
 
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index faea0ec612bf..e5bd60ff48e3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2382,6 +2382,19 @@ sub process {
                         }
                 }
 
+                if ($line =~ /\bprintk\s*\(\s*KERN_([A-Z]+)/) {
+                        my $orig = $1;
+                        my $level = lc($orig);
+                        $level = "warn" if ($level eq "warning");
+                        WARN("PREFER_PR_LEVEL",
+                             "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+                }
+
+                if ($line =~ /\bpr_warning\s*\(/) {
+                        WARN("PREFER_PR_LEVEL",
+                             "Prefer pr_warn(... to pr_warning(...\n" . $herecurr);
+                }
+
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
                 if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
@@ -2448,6 +2461,13 @@ sub process {
                                      "space prohibited between function name and open parenthesis '('\n" . $herecurr);
                         }
                 }
+
+# check for whitespace before a non-naked semicolon
+                if ($line =~ /^\+.*\S\s+;/) {
+                        CHK("SPACING",
+                            "space prohibited before semicolon\n" . $herecurr);
+                }
+
 # Check operator spacing.
                 if (!($line=~/\#\s*include/)) {
                         my $ops = qr{
diff --git a/scripts/coccinelle/misc/ifaddr.cocci b/scripts/coccinelle/misc/ifaddr.cocci
new file mode 100644
index 000000000000..3e4089a77000
--- /dev/null
+++ b/scripts/coccinelle/misc/ifaddr.cocci
@@ -0,0 +1,35 @@
+/// the address of a variable or field is non-zero is likely always to bo
+/// non-zero
+///
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options: -no_includes -include_headers
+
+virtual org
+virtual report
+virtual context
+
+@r@
+expression x;
+statement S1,S2;
+position p;
+@@
+
+*if@p (&x)
+ S1 else S2
+
+@script:python depends on org@
+p << r.p;
+@@
+
+cocci.print_main("test of a variable/field address",p)
+
+@script:python depends on report@
+p << r.p;
+@@
+
+msg = "ERROR: test of a variable/field address"
+coccilib.report.print_report(p[0],msg)
diff --git a/scripts/coccinelle/misc/noderef.cocci b/scripts/coccinelle/misc/noderef.cocci
new file mode 100644
index 000000000000..c1707214e602
--- /dev/null
+++ b/scripts/coccinelle/misc/noderef.cocci
@@ -0,0 +1,65 @@
+/// sizeof when applied to a pointer typed expression gives the size of
+/// the pointer
+///
+// Confidence: High
+// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
+// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments:
+// Options: -no_includes -include_headers
+
+virtual org
+virtual report
+virtual context
+virtual patch
+
+@depends on patch@
+expression *x;
+expression f;
+type T;
+@@
+
+(
+x = <+... sizeof(
+- x
++ *x
+   ) ...+>
+|
+f(...,(T)(x),...,sizeof(
+- x
++ *x
+   ),...)
+|
+f(...,sizeof(x),...,(T)(
+- x
++ *x
+   ),...)
+)
+
+@r depends on !patch@
+expression *x;
+expression f;
+position p;
+type T;
+@@
+
+(
+*x = <+... sizeof@p(x) ...+>
+|
+*f(...,(T)(x),...,sizeof@p(x),...)
+|
+*f(...,sizeof@p(x),...,(T)(x),...)
+)
+
+@script:python depends on org@
+p << r.p;
+@@
+
+cocci.print_main("application of sizeof to pointer",p)
+
+@script:python depends on report@
+p << r.p;
+@@
+
+msg = "ERROR: application of sizeof to pointer"
+coccilib.report.print_report(p[0],msg)
diff --git a/scripts/config b/scripts/config
index a7c7c4b8e957..ed6653ef9702 100755
--- a/scripts/config
+++ b/scripts/config
@@ -107,7 +107,8 @@ while [ "$1" != "" ] ; do
                 ;;
 
         --set-str)
-                set_var "CONFIG_$ARG" "CONFIG_$ARG=\"$1\""
+                # sed swallows one level of escaping, so we need double-escaping
+                set_var "CONFIG_$ARG" "CONFIG_$ARG=\"${1//\"/\\\\\"}\""
                 shift
                 ;;
 
@@ -124,9 +125,11 @@ while [ "$1" != "" ] ; do
                         if [ $? != 0 ] ; then
                                 echo undef
                         else
-                                V="${V/CONFIG_$ARG=/}"
-                                V="${V/\"/}"
-                                echo "$V"
+                                V="${V/#CONFIG_$ARG=/}"
+                                V="${V/#\"/}"
+                                V="${V/%\"/}"
+                                V="${V/\\\"/\"}"
+                                echo "${V}"
                         fi
                 fi
                 ;;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 0948c6b5a321..8b673dd4627f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -83,6 +83,8 @@ push(@signature_tags, "Signed-off-by:");
 push(@signature_tags, "Reviewed-by:");
 push(@signature_tags, "Acked-by:");
 
+my $signature_pattern = "\(" . join("|", @signature_tags) . "\)";
+
 # rfc822 email address - preloaded methods go here.
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
 my $rfc822_char = '[\\000-\\377]';
@@ -473,7 +475,6 @@ my @subsystem = ();
 my @status = ();
 my %deduplicate_name_hash = ();
 my %deduplicate_address_hash = ();
-my $signature_pattern;
 
 my @maintainers = get_maintainers();
 
diff --git a/scripts/gfp-translate b/scripts/gfp-translate
index c9230e158a8f..c9230e158a8f 100644..100755
--- a/scripts/gfp-translate
+++ b/scripts/gfp-translate
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index f208f900ed3a..0dc4a2c779b1 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -574,8 +574,15 @@ int main(int ac, char **av)
         case alldefconfig:
         case randconfig:
                 name = getenv("KCONFIG_ALLCONFIG");
-                if (name && !stat(name, &tmpstat)) {
-                        conf_read_simple(name, S_DEF_USER);
+                if (!name)
+                        break;
+                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
+                        if (conf_read_simple(name, S_DEF_USER)) {
+                                fprintf(stderr,
+                                        _("*** Can't read seed configuration \"%s\"!\n"),
+                                        name);
+                                exit(1);
+                        }
                         break;
                 }
                 switch (input_mode) {
@@ -586,10 +593,13 @@ int main(int ac, char **av)
                 case randconfig:        name = "allrandom.config"; break;
                 default: break;
                 }
-                if (!stat(name, &tmpstat))
-                        conf_read_simple(name, S_DEF_USER);
-                else if (!stat("all.config", &tmpstat))
-                        conf_read_simple("all.config", S_DEF_USER);
+                if (conf_read_simple(name, S_DEF_USER) &&
+                    conf_read_simple("all.config", S_DEF_USER)) {
+                        fprintf(stderr,
+                                _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+                                name);
+                        exit(1);
+                }
                 break;
         default:
                 break;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 2c6286c0bc1a..f606738d421d 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -240,7 +240,7 @@ search_help[] = N_(
         "Defined at drivers/pci/Kconfig:47\n"
         "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
         "Location:\n"
-        "  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+        "  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
         "    -> PCI support (PCI [=y])\n"
         "      -> PCI access mode (<choice> [=y])\n"
         "Selects: LIBCRC32\n"
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 73070cb0b6de..8c0eb65978c9 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -223,7 +223,7 @@ search_help[] = N_(
 "Defined at drivers/pci/Kconfig:47\n"
 "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
 "Location:\n"
-"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+"  -> Bus options (PCI, PCMCIA, EISA, ISA)\n"
 "    -> PCI support (PCI [ = y])\n"
 "      -> PCI access mode (<choice> [ = y])\n"
 "Selects: LIBCRC32\n"
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
new file mode 100644
index 000000000000..cd9c6c6bb4c9
--- /dev/null
+++ b/scripts/link-vmlinux.sh
@@ -0,0 +1,221 @@
+#!/bin/sh
+#
+# link vmlinux
+#
+# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
+# $(KBUILD_VMLINUX_MAIN). Most are built-in.o files from top-level directories
+# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
+# Ordering when linking is important, and $(KBUILD_VMLINUX_INIT) must be first.
+#
+# vmlinux
+#   ^
+#   |
+#   +-< $(KBUILD_VMLINUX_INIT)
+#   |   +--< init/version.o + more
+#   |
+#   +--< $(KBUILD_VMLINUX_MAIN)
+#   |    +--< drivers/built-in.o mm/built-in.o + more
+#   |
+#   +-< ${kallsymso} (see description in KALLSYMS section)
+#
+# vmlinux version (uname -v) cannot be updated during normal
+# descending-into-subdirs phase since we do not yet know if we need to
+# update vmlinux.
+# Therefore this step is delayed until just before final link of vmlinux.
+#
+# System.map is generated to document addresses of all kernel symbols
+
+# Error out on error
+set -e
+
+# Nice output in kbuild format
+# Will be supressed by "make -s"
+info()
+{
+        if [ "${quiet}" != "silent_" ]; then
+                printf "  %-7s %s\n" ${1} ${2}
+        fi
+}
+
+# Link of vmlinux.o used for section mismatch analysis
+# ${1} output file
+modpost_link()
+{
+        ${LD} ${LDFLAGS} -r -o ${1} ${KBUILD_VMLINUX_INIT}                   \
+                --start-group ${KBUILD_VMLINUX_MAIN} --end-group
+}
+
+# Link of vmlinux
+# ${1} - optional extra .o files
+# ${2} - output file
+vmlinux_link()
+{
+        local lds="${objtree}/${KBUILD_LDS}"
+
+        if [ "${SRCARCH}" != "um" ]; then
+                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}                  \
+                        -T ${lds} ${KBUILD_VMLINUX_INIT}                     \
+                        --start-group ${KBUILD_VMLINUX_MAIN} --end-group ${1}
+        else
+                ${CC} ${CFLAGS_vmlinux} -o ${2}                              \
+                        -Wl,-T,${lds} ${KBUILD_VMLINUX_INIT}                 \
+                        -Wl,--start-group                                    \
+                                 ${KBUILD_VMLINUX_MAIN}                      \
+                        -Wl,--end-group                                      \
+                        -lutil ${1}
+                rm -f linux
+        fi
+}
+
+
+# Create ${2} .o file with all symbols from the ${1} object file
+kallsyms()
+{
+        info KSYM ${2}
+        local kallsymopt;
+
+        if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
+                kallsymopt=--all-symbols
+        fi
+
+        local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
+                      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+
+        ${NM} -n ${1} | \
+                scripts/kallsyms ${kallsymopt} | \
+                ${CC} ${aflags} -c -o ${2} -x assembler-with-cpp -
+}
+
+# Create map file with all symbols from ${1}
+# See mksymap for additional details
+mksysmap()
+{
+        ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
+}
+
+sortextable()
+{
+        ${objtree}/scripts/sortextable ${1}
+}
+
+# Delete output files in case of error
+trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
+cleanup()
+{
+        rm -f .old_version
+        rm -f .tmp_System.map
+        rm -f .tmp_kallsyms*
+        rm -f .tmp_version
+        rm -f .tmp_vmlinux*
+        rm -f System.map
+        rm -f vmlinux
+        rm -f vmlinux.o
+}
+
+#
+#
+# Use "make V=1" to debug this script
+case "${KBUILD_VERBOSE}" in
+*1*)
+        set -x
+        ;;
+esac
+
+if [ "$1" = "clean" ]; then
+        cleanup
+        exit 0
+fi
+
+# We need access to CONFIG_ symbols
+. ./.config
+
+#link vmlinux.o
+info LD vmlinux.o
+modpost_link vmlinux.o
+
+# modpost vmlinux.o to check for section mismatches
+${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
+
+# Update version
+info GEN .version
+if [ ! -r .version ]; then
+        rm -f .version;
+        echo 1 >.version;
+else
+        mv .version .old_version;
+        expr 0$(cat .old_version) + 1 >.version;
+fi;
+
+# final build of init/
+${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
+
+kallsymso=""
+kallsyms_vmlinux=""
+if [ -n "${CONFIG_KALLSYMS}" ]; then
+
+        # kallsyms support
+        # Generate section listing all symbols and add it into vmlinux
+        # It's a three step process:
+        # 1)  Link .tmp_vmlinux1 so it has all symbols and sections,
+        #     but __kallsyms is empty.
+        #     Running kallsyms on that gives us .tmp_kallsyms1.o with
+        #     the right size
+        # 2)  Link .tmp_vmlinux2 so it now has a __kallsyms section of
+        #     the right size, but due to the added section, some
+        #     addresses have shifted.
+        #     From here, we generate a correct .tmp_kallsyms2.o
+        # 2a) We may use an extra pass as this has been necessary to
+        #     woraround some alignment related bugs.
+        #     KALLSYMS_EXTRA_PASS=1 is used to trigger this.
+        # 3)  The correct ${kallsymso} is linked into the final vmlinux.
+        #
+        # a)  Verify that the System.map from vmlinux matches the map from
+        #     ${kallsymso}.
+
+        kallsymso=.tmp_kallsyms2.o
+        kallsyms_vmlinux=.tmp_vmlinux2
+
+        # step 1
+        vmlinux_link "" .tmp_vmlinux1
+        kallsyms .tmp_vmlinux1 .tmp_kallsyms1.o
+
+        # step 2
+        vmlinux_link .tmp_kallsyms1.o .tmp_vmlinux2
+        kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
+
+        # step 2a
+        if [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
+                kallsymso=.tmp_kallsyms3.o
+                kallsyms_vmlinux=.tmp_vmlinux3
+
+                vmlinux_link .tmp_kallsyms2.o .tmp_vmlinux3
+
+                kallsyms .tmp_vmlinux3 .tmp_kallsyms3.o
+        fi
+fi
+
+info LD vmlinux
+vmlinux_link "${kallsymso}" vmlinux
+
+if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
+        info SORTEX vmlinux
+        sortextable vmlinux
+fi
+
+info SYSMAP System.map
+mksysmap vmlinux System.map
+
+# step a (see comment above)
+if [ -n "${CONFIG_KALLSYMS}" ]; then
+        mksysmap ${kallsyms_vmlinux} .tmp_System.map
+
+        if ! cmp -s System.map .tmp_System.map; then
+                echo Inconsistent kallsyms data
+                echo echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
+                cleanup
+                exit 1
+        fi
+fi
+
+# We made a new kernel - delete old version file
+rm -f .old_version
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 8e730ccc3f2b..5759751a1f61 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -336,10 +336,13 @@ static int do_hid_entry(const char *filename,
                              struct hid_device_id *id, char *alias)
 {
         id->bus = TO_NATIVE(id->bus);
+        id->group = TO_NATIVE(id->group);
         id->vendor = TO_NATIVE(id->vendor);
         id->product = TO_NATIVE(id->product);
 
-        sprintf(alias, "hid:b%04X", id->bus);
+        sprintf(alias, "hid:");
+        ADD(alias, "b", id->bus != HID_BUS_ANY, id->bus);
+        ADD(alias, "g", id->group != HID_GROUP_ANY, id->group);
         ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
         ADD(alias, "p", id->product != HID_ANY_ID, id->product);
 
@@ -1100,6 +1103,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
         if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
+        /* We're looking for an object */
+        if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
+                return;
+
         /* All our symbols are of form <prefix>__mod_XXX_device_table. */
         name = strstr(symname, "__mod_");
         if (!name)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index c4e7d1510f9d..0f84bb38eb0d 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -337,17 +337,20 @@ static void sym_update_crc(const char *name, struct module *mod,
 void *grab_file(const char *filename, unsigned long *size)
 {
         struct stat st;
-        void *map;
+        void *map = MAP_FAILED;
         int fd;
 
         fd = open(filename, O_RDONLY);
-        if (fd < 0 || fstat(fd, &st) != 0)
+        if (fd < 0)
                 return NULL;
+        if (fstat(fd, &st))
+                goto failed;
 
         *size = st.st_size;
         map = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-        close(fd);
 
+failed:
+        close(fd);
         if (map == MAP_FAILED)
                 return NULL;
         return map;
@@ -1850,14 +1853,14 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "\n");
         buf_printf(b, "struct module __this_module\n");
         buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-        buf_printf(b, " .name = KBUILD_MODNAME,\n");
+        buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
         if (mod->has_init)
-                buf_printf(b, " .init = init_module,\n");
+                buf_printf(b, "\t.init = init_module,\n");
         if (mod->has_cleanup)
                 buf_printf(b, "#ifdef CONFIG_MODULE_UNLOAD\n"
-                              " .exit = cleanup_module,\n"
+                              "\t.exit = cleanup_module,\n"
                               "#endif\n");
-        buf_printf(b, " .arch = MODULE_ARCH_INIT,\n");
+        buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n");
         buf_printf(b, "};\n");
 }
 
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index eee5f8ed2493..c95fdda58414 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -245,7 +245,7 @@ fi
 # Build header package
 (cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
-(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
new file mode 100644
index 000000000000..1ca9ceb95eb6
--- /dev/null
+++ b/scripts/sortextable.c
@@ -0,0 +1,322 @@
+/*
+ * sortextable.c: Sort the kernel's exception table
+ *
+ * Copyright 2011 - 2012 Cavium, Inc.
+ *
+ * Based on code taken from recortmcount.c which is:
+ *
+ * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>.  All rights reserved.
+ * Licensed under the GNU General Public License, version 2 (GPLv2).
+ *
+ * Restructured to fit Linux format, as well as other updates:
+ *  Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
+ */
+
+/*
+ * Strategy: alter the vmlinux file in-place.
+ */
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <getopt.h>
+#include <elf.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <tools/be_byteshift.h>
+#include <tools/le_byteshift.h>
+
+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 struct stat sb;  /* Remember .st_size, etc. */
+static jmp_buf jmpenv;  /* setjmp/longjmp per-file error escape */
+
+/* setjmp() return values */
+enum {
+        SJ_SETJMP = 0,  /* hardwired first return */
+        SJ_FAIL,
+        SJ_SUCCEED
+};
+
+/* Per-file resource cleanup when multiple files. */
+static void
+cleanup(void)
+{
+        if (!mmap_failed)
+                munmap(ehdr_curr, sb.st_size);
+        close(fd_map);
+}
+
+static void __attribute__((noreturn))
+fail_file(void)
+{
+        cleanup();
+        longjmp(jmpenv, SJ_FAIL);
+}
+
+static void __attribute__((noreturn))
+succeed_file(void)
+{
+        cleanup();
+        longjmp(jmpenv, SJ_SUCCEED);
+}
+
+
+/*
+ * Get the whole file as a programming convenience in order to avoid
+ * malloc+lseek+read+free of many pieces.  If successful, then mmap
+ * avoids copying unused pieces; else just read the whole file.
+ * Open for both read and write.
+ */
+static void *mmap_file(char const *fname)
+{
+        void *addr;
+
+        fd_map = open(fname, O_RDWR);
+        if (fd_map < 0 || fstat(fd_map, &sb) < 0) {
+                perror(fname);
+                fail_file();
+        }
+        if (!S_ISREG(sb.st_mode)) {
+                fprintf(stderr, "not a regular file: %s\n", fname);
+                fail_file();
+        }
+        addr = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_SHARED,
+                    fd_map, 0);
+        if (addr == MAP_FAILED) {
+                mmap_failed = 1;
+                fprintf(stderr, "Could not mmap file: %s\n", fname);
+                fail_file();
+        }
+        return addr;
+}
+
+static uint64_t r8be(const uint64_t *x)
+{
+        return get_unaligned_be64(x);
+}
+static uint32_t rbe(const uint32_t *x)
+{
+        return get_unaligned_be32(x);
+}
+static uint16_t r2be(const uint16_t *x)
+{
+        return get_unaligned_be16(x);
+}
+static uint64_t r8le(const uint64_t *x)
+{
+        return get_unaligned_le64(x);
+}
+static uint32_t rle(const uint32_t *x)
+{
+        return get_unaligned_le32(x);
+}
+static uint16_t r2le(const uint16_t *x)
+{
+        return get_unaligned_le16(x);
+}
+
+static void w8be(uint64_t val, uint64_t *x)
+{
+        put_unaligned_be64(val, x);
+}
+static void wbe(uint32_t val, uint32_t *x)
+{
+        put_unaligned_be32(val, x);
+}
+static void w2be(uint16_t val, uint16_t *x)
+{
+        put_unaligned_be16(val, x);
+}
+static void w8le(uint64_t val, uint64_t *x)
+{
+        put_unaligned_le64(val, x);
+}
+static void wle(uint32_t val, uint32_t *x)
+{
+        put_unaligned_le32(val, x);
+}
+static void w2le(uint16_t val, uint16_t *x)
+{
+        put_unaligned_le16(val, x);
+}
+
+static uint64_t (*r8)(const uint64_t *);
+static uint32_t (*r)(const uint32_t *);
+static uint16_t (*r2)(const uint16_t *);
+static void (*w8)(uint64_t, uint64_t *);
+static void (*w)(uint32_t, uint32_t *);
+static void (*w2)(uint16_t, uint16_t *);
+
+typedef void (*table_sort_t)(char *, int);
+
+/* 32 bit and 64 bit are very similar */
+#include "sortextable.h"
+#define SORTEXTABLE_64
+#include "sortextable.h"
+
+static int compare_x86_table(const void *a, const void *b)
+{
+        int32_t av = (int32_t)r(a);
+        int32_t bv = (int32_t)r(b);
+
+        if (av < bv)
+                return -1;
+        if (av > bv)
+                return 1;
+        return 0;
+}
+
+static void sort_x86_table(char *extab_image, int image_size)
+{
+        int i;
+
+        /*
+         * Do the same thing the runtime sort does, first normalize to
+         * being relative to the start of the section.
+         */
+        i = 0;
+        while (i < image_size) {
+                uint32_t *loc = (uint32_t *)(extab_image + i);
+                w(r(loc) + i, loc);
+                i += 4;
+        }
+
+        qsort(extab_image, image_size / 8, 8, compare_x86_table);
+
+        /* Now denormalize. */
+        i = 0;
+        while (i < image_size) {
+                uint32_t *loc = (uint32_t *)(extab_image + i);
+                w(r(loc) - i, loc);
+                i += 4;
+        }
+}
+
+static void
+do_file(char const *const fname)
+{
+        table_sort_t custom_sort;
+        Elf32_Ehdr *ehdr = mmap_file(fname);
+
+        ehdr_curr = ehdr;
+        switch (ehdr->e_ident[EI_DATA]) {
+        default:
+                fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
+                        ehdr->e_ident[EI_DATA], fname);
+                fail_file();
+                break;
+        case ELFDATA2LSB:
+                r = rle;
+                r2 = r2le;
+                r8 = r8le;
+                w = wle;
+                w2 = w2le;
+                w8 = w8le;
+                break;
+        case ELFDATA2MSB:
+                r = rbe;
+                r2 = r2be;
+                r8 = r8be;
+                w = wbe;
+                w2 = w2be;
+                w8 = w8be;
+                break;
+        }  /* end switch */
+        if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0
+        ||  r2(&ehdr->e_type) != ET_EXEC
+        ||  ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
+                fprintf(stderr, "unrecognized ET_EXEC file %s\n", fname);
+                fail_file();
+        }
+
+        custom_sort = NULL;
+        switch (r2(&ehdr->e_machine)) {
+        default:
+                fprintf(stderr, "unrecognized e_machine %d %s\n",
+                        r2(&ehdr->e_machine), fname);
+                fail_file();
+                break;
+        case EM_386:
+        case EM_X86_64:
+                custom_sort = sort_x86_table;
+                break;
+        case EM_MIPS:
+                break;
+        }  /* end switch */
+
+        switch (ehdr->e_ident[EI_CLASS]) {
+        default:
+                fprintf(stderr, "unrecognized ELF class %d %s\n",
+                        ehdr->e_ident[EI_CLASS], fname);
+                fail_file();
+                break;
+        case ELFCLASS32:
+                if (r2(&ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
+                ||  r2(&ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
+                        fprintf(stderr,
+                                "unrecognized ET_EXEC file: %s\n", fname);
+                        fail_file();
+                }
+                do32(ehdr, fname, custom_sort);
+                break;
+        case ELFCLASS64: {
+                Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
+                if (r2(&ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
+                ||  r2(&ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
+                        fprintf(stderr,
+                                "unrecognized ET_EXEC file: %s\n", fname);
+                        fail_file();
+                }
+                do64(ghdr, fname, custom_sort);
+                break;
+        }
+        }  /* end switch */
+
+        cleanup();
+}
+
+int
+main(int argc, char *argv[])
+{
+        int n_error = 0;  /* gcc-4.3.0 false positive complaint */
+        int i;
+
+        if (argc < 2) {
+                fprintf(stderr, "usage: sortextable vmlinux...\n");
+                return 0;
+        }
+
+        /* Process each file in turn, allowing deep failure. */
+        for (i = 1; i < argc; i++) {
+                char *file = argv[i];
+                int const sjval = setjmp(jmpenv);
+
+                switch (sjval) {
+                default:
+                        fprintf(stderr, "internal error: %s\n", file);
+                        exit(1);
+                        break;
+                case SJ_SETJMP:    /* normal sequence */
+                        /* Avoid problems if early cleanup() */
+                        fd_map = -1;
+                        ehdr_curr = NULL;
+                        mmap_failed = 1;
+                        do_file(file);
+                        break;
+                case SJ_FAIL:    /* error in do_file or below */
+                        ++n_error;
+                        break;
+                case SJ_SUCCEED:    /* premature success */
+                        /* do nothing */
+                        break;
+                }  /* end switch */
+        }
+        return !!n_error;
+}
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
new file mode 100644
index 000000000000..e4fd45b7e456
--- /dev/null
+++ b/scripts/sortextable.h
@@ -0,0 +1,191 @@
+/*
+ * sortextable.h
+ *
+ * Copyright 2011 - 2012 Cavium, Inc.
+ *
+ * Some of this code was taken out of recordmcount.h written by:
+ *
+ * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>.  All rights reserved.
+ * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
+ *
+ *
+ * Licensed under the GNU General Public License, version 2 (GPLv2).
+ */
+
+#undef extable_ent_size
+#undef compare_extable
+#undef do_func
+#undef Elf_Addr
+#undef Elf_Ehdr
+#undef Elf_Shdr
+#undef Elf_Rel
+#undef Elf_Rela
+#undef Elf_Sym
+#undef ELF_R_SYM
+#undef Elf_r_sym
+#undef ELF_R_INFO
+#undef Elf_r_info
+#undef ELF_ST_BIND
+#undef ELF_ST_TYPE
+#undef fn_ELF_R_SYM
+#undef fn_ELF_R_INFO
+#undef uint_t
+#undef _r
+#undef _w
+
+#ifdef SORTEXTABLE_64
+# define extable_ent_size       16
+# define compare_extable        compare_extable_64
+# define do_func                do64
+# define Elf_Addr               Elf64_Addr
+# define Elf_Ehdr               Elf64_Ehdr
+# define Elf_Shdr               Elf64_Shdr
+# define Elf_Rel                Elf64_Rel
+# define Elf_Rela               Elf64_Rela
+# define Elf_Sym                Elf64_Sym
+# define ELF_R_SYM              ELF64_R_SYM
+# define Elf_r_sym              Elf64_r_sym
+# define ELF_R_INFO             ELF64_R_INFO
+# define Elf_r_info             Elf64_r_info
+# define ELF_ST_BIND            ELF64_ST_BIND
+# define ELF_ST_TYPE            ELF64_ST_TYPE
+# define fn_ELF_R_SYM           fn_ELF64_R_SYM
+# define fn_ELF_R_INFO          fn_ELF64_R_INFO
+# define uint_t                 uint64_t
+# define _r                     r8
+# define _w                     w8
+#else
+# define extable_ent_size       8
+# define compare_extable        compare_extable_32
+# define do_func                do32
+# define Elf_Addr               Elf32_Addr
+# define Elf_Ehdr               Elf32_Ehdr
+# define Elf_Shdr               Elf32_Shdr
+# define Elf_Rel                Elf32_Rel
+# define Elf_Rela               Elf32_Rela
+# define Elf_Sym                Elf32_Sym
+# define ELF_R_SYM              ELF32_R_SYM
+# define Elf_r_sym              Elf32_r_sym
+# define ELF_R_INFO             ELF32_R_INFO
+# define Elf_r_info             Elf32_r_info
+# define ELF_ST_BIND            ELF32_ST_BIND
+# define ELF_ST_TYPE            ELF32_ST_TYPE
+# define fn_ELF_R_SYM           fn_ELF32_R_SYM
+# define fn_ELF_R_INFO          fn_ELF32_R_INFO
+# define uint_t                 uint32_t
+# define _r                     r
+# define _w                     w
+#endif
+
+static int compare_extable(const void *a, const void *b)
+{
+        Elf_Addr av = _r(a);
+        Elf_Addr bv = _r(b);
+
+        if (av < bv)
+                return -1;
+        if (av > bv)
+                return 1;
+        return 0;
+}
+
+static void
+do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
+{
+        Elf_Shdr *shdr;
+        Elf_Shdr *shstrtab_sec;
+        Elf_Shdr *strtab_sec = NULL;
+        Elf_Shdr *symtab_sec = NULL;
+        Elf_Shdr *extab_sec = NULL;
+        Elf_Sym *sym;
+        Elf_Sym *sort_needed_sym;
+        Elf_Shdr *sort_needed_sec;
+        Elf_Rel *relocs = NULL;
+        int relocs_size;
+        uint32_t *sort_done_location;
+        const char *secstrtab;
+        const char *strtab;
+        char *extab_image;
+        int extab_index = 0;
+        int i;
+        int idx;
+
+        shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
+        shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
+        secstrtab = (const char *)ehdr + _r(&shstrtab_sec->sh_offset);
+        for (i = 0; i < r2(&ehdr->e_shnum); i++) {
+                idx = r(&shdr[i].sh_name);
+                if (strcmp(secstrtab + idx, "__ex_table") == 0) {
+                        extab_sec = shdr + i;
+                        extab_index = i;
+                }
+                if ((r(&shdr[i].sh_type) == SHT_REL ||
+                     r(&shdr[i].sh_type) == SHT_RELA) &&
+                    r(&shdr[i].sh_info) == extab_index) {
+                        relocs = (void *)ehdr + _r(&shdr[i].sh_offset);
+                        relocs_size = _r(&shdr[i].sh_size);
+                }
+                if (strcmp(secstrtab + idx, ".symtab") == 0)
+                        symtab_sec = shdr + i;
+                if (strcmp(secstrtab + idx, ".strtab") == 0)
+                        strtab_sec = shdr + i;
+        }
+        if (strtab_sec == NULL) {
+                fprintf(stderr, "no .strtab in  file: %s\n", fname);
+                fail_file();
+        }
+        if (symtab_sec == NULL) {
+                fprintf(stderr, "no .symtab in  file: %s\n", fname);
+                fail_file();
+        }
+        if (extab_sec == NULL) {
+                fprintf(stderr, "no __ex_table in  file: %s\n", fname);
+                fail_file();
+        }
+        strtab = (const char *)ehdr + _r(&strtab_sec->sh_offset);
+
+        extab_image = (void *)ehdr + _r(&extab_sec->sh_offset);
+
+        if (custom_sort) {
+                custom_sort(extab_image, _r(&extab_sec->sh_size));
+        } else {
+                int num_entries = _r(&extab_sec->sh_size) / extable_ent_size;
+                qsort(extab_image, num_entries,
+                      extable_ent_size, compare_extable);
+        }
+        /* If there were relocations, we no longer need them. */
+        if (relocs)
+                memset(relocs, 0, relocs_size);
+
+        /* find main_extable_sort_needed */
+        sort_needed_sym = NULL;
+        for (i = 0; i < _r(&symtab_sec->sh_size) / sizeof(Elf_Sym); i++) {
+                sym = (void *)ehdr + _r(&symtab_sec->sh_offset);
+                sym += i;
+                if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
+                        continue;
+                idx = r(&sym->st_name);
+                if (strcmp(strtab + idx, "main_extable_sort_needed") == 0) {
+                        sort_needed_sym = sym;
+                        break;
+                }
+        }
+        if (sort_needed_sym == NULL) {
+                fprintf(stderr,
+                        "no main_extable_sort_needed symbol in  file: %s\n",
+                        fname);
+                fail_file();
+        }
+        sort_needed_sec = &shdr[r2(&sort_needed_sym->st_shndx)];
+        sort_done_location = (void *)ehdr +
+                _r(&sort_needed_sec->sh_offset) +
+                _r(&sort_needed_sym->st_value) -
+                _r(&sort_needed_sec->sh_addr);
+
+#if 1
+        printf("sort done marker at %lx\n",
+               (unsigned long)((char *)sort_done_location - (char *)ehdr));
+#endif
+        /* We sorted it, clear the flag. */
+        w(0, sort_done_location);
+}