Merge commit v3.13-rc1 into kbuild/misc

22 files changed, 303 insertions, 124 deletions

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 8dcdca27d836..69f0a1417e9a 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -79,9 +79,11 @@ modpost = scripts/mod/modpost                    \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 
+MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
+
 # We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
 
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index db0e5cd34c70..91c4117637ae 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -1353,6 +1353,8 @@ static void render_out_of_line_list(FILE *out)
                         render_opcode(out, "ASN1_OP_END_SET_OF%s,\n", act);
                         render_opcode(out, "_jump_target(%u),\n", entry);
                         break;
+                default:
+                        break;
                 }
                 if (e->action)
                         render_opcode(out, "_action(ACT_%s),\n",
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 6129020c41a9..549d0ab8c662 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -19,9 +19,10 @@ def getsizes(file):
         size, type, name = l[:-1].split()
         if type in "tTdDbBrR":
             # strip generated symbols
-            if name[:6] == "__mod_": continue
-            # function names begin with '.' on 64-bit powerpc
-            if "." in name[1:]: name = "static." + name.split(".")[0]
+            if name.startswith("__mod_"): continue
+            if name == "linux_banner": continue
+            # statics and some other optimizations adds random .NUMBER
+            name = re.sub(r'\.[0-9]+', '', name)
             sym[name] = sym.get(name, 0) + int(size, 16)
     return sym
 
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 47016c304c84..9c9810030377 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -241,8 +241,11 @@ our $Sparse	= qr{
                         __ref|
                         __rcu
                 }x;
-
-our $InitAttribute = qr{__(?:mem|cpu|dev|net_|)(?:initdata|initconst|init\b)};
+our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)};
+our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)};
+our $InitAttributeConst = qr{$InitAttributePrefix(?:initconst\b)};
+our $InitAttributeInit = qr{$InitAttributePrefix(?:init\b)};
+our $InitAttribute = qr{$InitAttributeData|$InitAttributeConst|$InitAttributeInit};
 
 # Notes to $Attribute:
 # We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
@@ -323,7 +326,8 @@ our $logFunctions = qr{(?x:
         (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
         WARN(?:_RATELIMIT|_ONCE|)|
         panic|
-        MODULE_[A-Z_]+
+        MODULE_[A-Z_]+|
+        seq_vprintf|seq_printf|seq_puts
 )};
 
 our $signature_tags = qr{(?xi:
@@ -442,8 +446,9 @@ sub seed_camelcase_file {
                 next if ($line !~ /(?:[A-Z][a-z]|[a-z][A-Z])/);
                 if ($line =~ /^[ \t]*(?:#[ \t]*define|typedef\s+$Type)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)/) {
                         $camelcase{$1} = 1;
-                }
-                elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*\(/) {
+                } elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[\(\[,;]/) {
+                        $camelcase{$1} = 1;
+                } elsif ($line =~ /^\s*(?:union|struct|enum)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[;\{]/) {
                         $camelcase{$1} = 1;
                 }
         }
@@ -1512,6 +1517,14 @@ sub rtrim {
         return $string;
 }
 
+sub string_find_replace {
+        my ($string, $find, $replace) = @_;
+
+        $string =~ s/$find/$replace/g;
+
+        return $string;
+}
+
 sub tabify {
         my ($leading) = @_;
 
@@ -1612,6 +1625,8 @@ sub process {
         my @setup_docs = ();
         my $setup_docs = 0;
 
+        my $camelcase_file_seeded = 0;
+
         sanitise_line_reset();
         my $line;
         foreach my $rawline (@rawlines) {
@@ -1754,11 +1769,11 @@ sub process {
                 # extract the filename as it passes
                 if ($line =~ /^diff --git.*?(\S+)$/) {
                         $realfile = $1;
-                        $realfile =~ s@^([^/]*)/@@;
+                        $realfile =~ s@^([^/]*)/@@ if (!$file);
                         $in_commit_log = 0;
                 } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                         $realfile = $1;
-                        $realfile =~ s@^([^/]*)/@@;
+                        $realfile =~ s@^([^/]*)/@@ if (!$file);
                         $in_commit_log = 0;
 
                         $p1_prefix = $1;
@@ -1947,6 +1962,18 @@ sub process {
                         $rpt_cleaners = 1;
                 }
 
+# Check for FSF mailing addresses.
+                if ($rawline =~ /You should have received a copy/ ||
+                    $rawline =~ /write to the Free Software/ ||
+                    $rawline =~ /59 Temple Place/ ||
+                    $rawline =~ /51 Franklin Street/) {
+                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+                        my $msg_type = \&ERROR;
+                        $msg_type = \&CHK if ($file);
+                        &{$msg_type}("FSF_MAILING_ADDRESS",
+                                "Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
+                }
+
 # check for Kconfig help text having a real description
 # Only applies when adding the entry originally, after that we do not have
 # sufficient context to determine whether it is indeed long enough.
@@ -2838,7 +2865,7 @@ sub process {
                                 \+=|-=|\*=|\/=|%=|\^=|\|=|&=|
                                 =>|->|<<|>>|<|>|=|!|~|
                                 &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
-                                \?|:
+                                \?:|\?|:
                         }x;
                         my @elements = split(/($ops|;)/, $opline);
 
@@ -3061,15 +3088,13 @@ sub process {
                                                 $ok = 1;
                                         }
 
-                                        # Ignore ?:
-                                        if (($opv eq ':O' && $ca =~ /\?$/) ||
-                                            ($op eq '?' && $cc =~ /^:/)) {
-                                                $ok = 1;
-                                        }
-
+                                        # messages are ERROR, but ?: are CHK
                                         if ($ok == 0) {
-                                                if (ERROR("SPACING",
-                                                          "spaces required around that '$op' $at\n" . $hereptr)) {
+                                                my $msg_type = \&ERROR;
+                                                $msg_type = \&CHK if (($op eq '?:' || $op eq '?' || $op eq ':') && $ctx =~ /VxV/);
+
+                                                if (&{$msg_type}("SPACING",
+                                                                 "spaces required around that '$op' $at\n" . $hereptr)) {
                                                         $good = rtrim($fix_elements[$n]) . " " . trim($fix_elements[$n + 1]) . " ";
                                                         if (defined $fix_elements[$n + 2]) {
                                                                 $fix_elements[$n + 2] =~ s/^\s+//;
@@ -3208,21 +3233,10 @@ sub process {
                 }
 
 # Return is not a function.
-                if (defined($stat) && $stat =~ /^.\s*return(\s*)(\(.*);/s) {
+                if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
                         my $spacing = $1;
-                        my $value = $2;
-
-                        # Flatten any parentheses
-                        $value =~ s/\(/ \(/g;
-                        $value =~ s/\)/\) /g;
-                        while ($value =~ s/\[[^\[\]]*\]/1/ ||
-                               $value !~ /(?:$Ident|-?$Constant)\s*
-                                             $Compare\s*
-                                             (?:$Ident|-?$Constant)/x &&
-                               $value =~ s/\([^\(\)]*\)/1/) {
-                        }
-#print "value<$value>\n";
-                        if ($value =~ /^\s*(?:$Ident|-?$Constant)\s*$/) {
+                        if ($^V && $^V ge 5.10.0 &&
+                            $stat =~ /^.\s*return\s*$balanced_parens\s*;\s*$/) {
                                 ERROR("RETURN_PARENTHESES",
                                       "return is not a function, parentheses are not required\n" . $herecurr);
 
@@ -3231,6 +3245,7 @@ sub process {
                                       "space required before the open parenthesis '('\n" . $herecurr);
                         }
                 }
+
 # Return of what appears to be an errno should normally be -'ve
                 if ($line =~ /^.\s*return\s*(E[A-Z]*)\s*;/) {
                         my $name = $1;
@@ -3274,6 +3289,7 @@ sub process {
                         }
                 }
                 if (!defined $suppress_whiletrailers{$linenr} &&
+                    defined($stat) && defined($cond) &&
                     $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
                         my ($s, $c) = ($stat, $cond);
 
@@ -3396,7 +3412,13 @@ sub process {
                                 while ($var =~ m{($Ident)}g) {
                                         my $word = $1;
                                         next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/);
-                                        seed_camelcase_includes() if ($check);
+                                        if ($check) {
+                                                seed_camelcase_includes();
+                                                if (!$file && !$camelcase_file_seeded) {
+                                                        seed_camelcase_file($realfile);
+                                                        $camelcase_file_seeded = 1;
+                                                }
+                                        }
                                         if (!defined $camelcase{$word}) {
                                                 $camelcase{$word} = 1;
                                                 CHK("CAMELCASE",
@@ -3725,14 +3747,6 @@ sub process {
                         }
                 }
 
-sub string_find_replace {
-        my ($string, $find, $replace) = @_;
-
-        $string =~ s/$find/$replace/g;
-
-        return $string;
-}
-
 # check for bad placement of section $InitAttribute (e.g.: __initdata)
                 if ($line =~ /(\b$InitAttribute\b)/) {
                         my $attr = $1;
@@ -3751,6 +3765,35 @@ sub string_find_replace {
                         }
                 }
 
+# check for $InitAttributeData (ie: __initdata) with const
+                if ($line =~ /\bconst\b/ && $line =~ /($InitAttributeData)/) {
+                        my $attr = $1;
+                        $attr =~ /($InitAttributePrefix)(.*)/;
+                        my $attr_prefix = $1;
+                        my $attr_type = $2;
+                        if (ERROR("INIT_ATTRIBUTE",
+                                  "Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$linenr - 1] =~
+                                    s/$InitAttributeData/${attr_prefix}initconst/;
+                        }
+                }
+
+# check for $InitAttributeConst (ie: __initconst) without const
+                if ($line !~ /\bconst\b/ && $line =~ /($InitAttributeConst)/) {
+                        my $attr = $1;
+                        if (ERROR("INIT_ATTRIBUTE",
+                                  "Use of $attr requires a separate use of const\n" . $herecurr) &&
+                            $fix) {
+                                my $lead = $fixed[$linenr - 1] =~
+                                    /(^\+\s*(?:static\s+))/;
+                                $lead = rtrim($1);
+                                $lead = "$lead " if ($lead !~ /^\+$/);
+                                $lead = "${lead}const ";
+                                $fixed[$linenr - 1] =~ s/(^\+\s*(?:static\s+))/$lead/;
+                        }
+                }
+
 # prefer usleep_range over udelay
                 if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) {
                         # ignore udelay's < 10, however
@@ -3810,8 +3853,8 @@ sub string_find_replace {
 # 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)\(/) {
                         if (!ctx_has_comment($first_line, $linenr)) {
-                                CHK("MEMORY_BARRIER",
-                                    "memory barrier without comment\n" . $herecurr);
+                                WARN("MEMORY_BARRIER",
+                                     "memory barrier without comment\n" . $herecurr);
                         }
                 }
 # check of hardware specific defines
@@ -3835,7 +3878,8 @@ sub string_find_replace {
                 }
 
 # Check for __inline__ and __inline, prefer inline
-                if ($line =~ /\b(__inline__|__inline)\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b(__inline__|__inline)\b/) {
                         if (WARN("INLINE",
                                  "plain inline is preferred over $1\n" . $herecurr) &&
                             $fix) {
@@ -3845,19 +3889,22 @@ sub string_find_replace {
                 }
 
 # Check for __attribute__ packed, prefer __packed
-                if ($line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
                         WARN("PREFER_PACKED",
                              "__packed is preferred over __attribute__((packed))\n" . $herecurr);
                 }
 
 # Check for __attribute__ aligned, prefer __aligned
-                if ($line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(.*aligned/) {
                         WARN("PREFER_ALIGNED",
                              "__aligned(size) is preferred over __attribute__((aligned(size)))\n" . $herecurr);
                 }
 
 # Check for __attribute__ format(printf, prefer __printf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf/) {
                         if (WARN("PREFER_PRINTF",
                                  "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr) &&
                             $fix) {
@@ -3867,7 +3914,8 @@ sub string_find_replace {
                 }
 
 # Check for __attribute__ format(scanf, prefer __scanf
-                if ($line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
+                if ($realfile !~ m@\binclude/uapi/@ &&
+                    $line =~ /\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\b/) {
                         if (WARN("PREFER_SCANF",
                                  "__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr) &&
                             $fix) {
@@ -3903,9 +3951,9 @@ sub string_find_replace {
                 }
 
 # check for seq_printf uses that could be seq_puts
-                if ($line =~ /\bseq_printf\s*\(/) {
+                if ($sline =~ /\bseq_printf\s*\(.*"\s*\)\s*;\s*$/) {
                         my $fmt = get_quoted_string($line, $rawline);
-                        if ($fmt !~ /[^\\]\%/) {
+                        if ($fmt ne "" && $fmt !~ /[^\\]\%/) {
                                 if (WARN("PREFER_SEQ_PUTS",
                                          "Prefer seq_puts to seq_printf\n" . $herecurr) &&
                                     $fix) {
@@ -3972,11 +4020,28 @@ sub string_find_replace {
                         }
                 }
 
+# check for naked sscanf
+                if ($^V && $^V ge 5.10.0 &&
+                    defined $stat &&
+                    $stat =~ /\bsscanf\b/ &&
+                    ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
+                     $stat !~ /\bsscanf\s*$balanced_parens\s*(?:$Compare)/ &&
+                     $stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) {
+                        my $lc = $stat =~ tr@\n@@;
+                        $lc = $lc + $linenr;
+                        my $stat_real = raw_line($linenr, 0);
+                        for (my $count = $linenr + 1; $count <= $lc; $count++) {
+                                $stat_real = $stat_real . "\n" . raw_line($count, 0);
+                        }
+                        WARN("NAKED_SSCANF",
+                             "unchecked sscanf return value\n" . "$here\n$stat_real\n");
+                }
+
 # check for new externs in .h files.
                 if ($realfile =~ /\.h$/ &&
                     $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) {
-                        if (WARN("AVOID_EXTERNS",
-                                 "extern prototypes should be avoided in .h files\n" . $herecurr) &&
+                        if (CHK("AVOID_EXTERNS",
+                                "extern prototypes should be avoided in .h files\n" . $herecurr) &&
                             $fix) {
                                 $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/;
                         }
@@ -4190,6 +4255,12 @@ sub string_find_replace {
                              "usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
                 }
 
+# Use of __ARCH_HAS_<FOO> or ARCH_HAVE_<BAR> is wrong.
+                if ($line =~ /\+\s*#\s*define\s+((?:__)?ARCH_(?:HAS|HAVE)\w*)\b/) {
+                        ERROR("DEFINE_ARCH_HAS",
+                              "#define of '$1' is wrong - use Kconfig variables or standard guards instead\n" . $herecurr);
+                }
+
 # check for %L{u,d,i} in strings
                 my $string;
                 while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
diff --git a/scripts/docproc.c b/scripts/docproc.c
index 4cfdc1797eb8..2b69eaf5b646 100644
--- a/scripts/docproc.c
+++ b/scripts/docproc.c
@@ -72,6 +72,7 @@ FILELINE * docsection;
 #define FUNCTION      "-function"
 #define NOFUNCTION    "-nofunction"
 #define NODOCSECTIONS "-no-doc-sections"
+#define SHOWNOTFOUND  "-show-not-found"
 
 static char *srctree, *kernsrctree;
 
@@ -294,6 +295,7 @@ static void singfunc(char * filename, char * line)
         int startofsym = 1;
         vec[idx++] = KERNELDOC;
         vec[idx++] = DOCBOOK;
+        vec[idx++] = SHOWNOTFOUND;
 
         /* Split line up in individual parameters preceded by FUNCTION */
         for (i=0; line[i]; i++) {
@@ -325,7 +327,8 @@ static void singfunc(char * filename, char * line)
  */
 static void docsect(char *filename, char *line)
 {
-        char *vec[6]; /* kerneldoc -docbook -function "section" file NULL */
+        /* kerneldoc -docbook -show-not-found -function "section" file NULL */
+        char *vec[7];
         char *s;
 
         for (s = line; *s; s++)
@@ -341,10 +344,11 @@ static void docsect(char *filename, char *line)
 
         vec[0] = KERNELDOC;
         vec[1] = DOCBOOK;
-        vec[2] = FUNCTION;
-        vec[3] = line;
-        vec[4] = filename;
-        vec[5] = NULL;
+        vec[2] = SHOWNOTFOUND;
+        vec[3] = FUNCTION;
+        vec[4] = line;
+        vec[5] = filename;
+        vec[6] = NULL;
         exec_kernel_doc(vec);
 }
 
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index b482f162a18a..ef474098d9f1 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -240,12 +240,24 @@ case "$arg" in
                 output_file="$1"
                 cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
                 output=${cpio_list}
-                echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
-                echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
-                echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
-                echo "$output_file" | grep -q "\.xz$" && \
-                                compr="xz --check=crc32 --lzma2=dict=1MiB"
-                echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
+                echo "$output_file" | grep -q "\.gz$" \
+                && [ -x "`which gzip 2> /dev/null`" ] \
+                && compr="gzip -n -9 -f"
+                echo "$output_file" | grep -q "\.bz2$" \
+                && [ -x "`which bzip2 2> /dev/null`" ] \
+                && compr="bzip2 -9 -f"
+                echo "$output_file" | grep -q "\.lzma$" \
+                && [ -x "`which lzma 2> /dev/null`" ] \
+                && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.xz$" \
+                && [ -x "`which xz 2> /dev/null`" ] \
+                && compr="xz --check=crc32 --lzma2=dict=1MiB"
+                echo "$output_file" | grep -q "\.lzo$" \
+                && [ -x "`which lzop 2> /dev/null`" ] \
+                && compr="lzop -9 -f"
+                echo "$output_file" | grep -q "\.lz4$" \
+                && [ -x "`which lz4 2> /dev/null`" ] \
+                && compr="lz4 -9 -f"
                 echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                 shift
                 ;;
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 487ac6f37ca2..10085de886fe 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -55,6 +55,7 @@ static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
+static unsigned long long kernel_start_addr = 0;
 
 int token_profit[0x10000];
 
@@ -65,7 +66,10 @@ unsigned char best_table_len[256];
 
 static void usage(void)
 {
-        fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
+        fprintf(stderr, "Usage: kallsyms [--all-symbols] "
+                        "[--symbol-prefix=<prefix char>] "
+                        "[--page-offset=<CONFIG_PAGE_OFFSET>] "
+                        "< in.map > out.S\n");
         exit(1);
 }
 
@@ -111,6 +115,12 @@ static int read_symbol(FILE *in, struct sym_entry *s)
                         fprintf(stderr, "Read error or end of file.\n");
                 return -1;
         }
+        if (strlen(str) > KSYM_NAME_LEN) {
+                fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"
+                                "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
+                        str, strlen(str), KSYM_NAME_LEN);
+                return -1;
+        }
 
         sym = str;
         /* skip prefix char */
@@ -194,6 +204,9 @@ static int symbol_valid(struct sym_entry *s)
         int i;
         int offset = 1;
 
+        if (s->addr < kernel_start_addr)
+                return 0;
+
         /* skip prefix char */
         if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
                 offset++;
@@ -646,6 +659,9 @@ int main(int argc, char **argv)
                                 if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
                                         p++;
                                 symbol_prefix_char = *p;
+                        } else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
+                                const char *p = &argv[i][14];
+                                kernel_start_addr = strtoull(p, NULL, 16);
                         } else
                                 usage();
                 }
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index df198a5f4822..ba663e1dc7e3 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -93,7 +93,7 @@ struct symbol {
 #define SYMBOL_CHOICEVAL  0x0020  /* used as a value in a choice block */
 #define SYMBOL_VALID      0x0080  /* set when symbol.curr is calculated */
 #define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
-#define SYMBOL_WRITE      0x0200  /* ? */
+#define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */
 #define SYMBOL_CHANGED    0x0400  /* ? */
 #define SYMBOL_AUTO       0x1000  /* value from environment variable */
 #define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 2c3963165a0d..59184bb41ef8 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -25,7 +25,7 @@
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"This interface let you select features and parameters for the build.\n"
+"This interface lets you select features and parameters for the build.\n"
 "Features can either be built-in, modularized, or ignored. Parameters\n"
 "must be entered in as decimal or hexadecimal numbers or text.\n"
 "\n"
@@ -39,15 +39,15 @@ static const char mconf_readme[] = N_(
 "\n"
 "To change any of these features, highlight it with the cursor\n"
 "keys and press <Y> to build it in, <M> to make it a module or\n"
-"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
-"through the available options (ie. Y->N->M->Y).\n"
+"<N> to remove it.  You may also press the <Space Bar> to cycle\n"
+"through the available options (i.e. Y->N->M->Y).\n"
 "\n"
 "Some additional keyboard hints:\n"
 "\n"
 "Menus\n"
 "----------\n"
-"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
-"   you wish to change or submenu wish to select and press <Enter>.\n"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item you\n"
+"   wish to change or the submenu you wish to select and press <Enter>.\n"
 "   Submenus are designated by \"--->\", empty ones by \"----\".\n"
 "\n"
 "   Shortcut: Press the option's highlighted letter (hotkey).\n"
@@ -65,7 +65,7 @@ static const char mconf_readme[] = N_(
 "             there is a delayed response which you may find annoying.\n"
 "\n"
 "   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
-"   <Exit> and <Help>.\n"
+"   <Exit>, <Help>, <Save>, and <Load>.\n"
 "\n"
 "o  To get help with an item, use the cursor keys to highlight <Help>\n"
 "   and press <ENTER>.\n"
@@ -105,7 +105,7 @@ static const char mconf_readme[] = N_(
 "Text Box    (Help Window)\n"
 "--------\n"
 "o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
-"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for \n"
+"   keys h,j,k,l function here as do <u>, <d>, <SPACE BAR> and <B> for\n"
 "   those who are familiar with less and lynx.\n"
 "\n"
 "o  Press <E>, <X>, <q>, <Enter> or <Esc><Esc> to exit.\n"
@@ -117,23 +117,21 @@ static const char mconf_readme[] = N_(
 "those who, for various reasons, find it necessary to switch\n"
 "between different configurations.\n"
 "\n"
-"At the end of the main menu you will find two options.  One is\n"
-"for saving the current configuration to a file of your choosing.\n"
-"The other option is for loading a previously saved alternate\n"
-"configuration.\n"
+"The <Save> button will let you save the current configuration to\n"
+"a file of your choosing.  Use the <Load> button to load a previously\n"
+"saved alternate configuration.\n"
 "\n"
-"Even if you don't use alternate configuration files, but you\n"
-"find during a Menuconfig session that you have completely messed\n"
-"up your settings, you may use the \"Load Alternate...\" option to\n"
-"restore your previously saved settings from \".config\" without\n"
-"restarting Menuconfig.\n"
+"Even if you don't use alternate configuration files, but you find\n"
+"during a Menuconfig session that you have completely messed up your\n"
+"settings, you may use the <Load> button to restore your previously\n"
+"saved settings from \".config\" without restarting Menuconfig.\n"
 "\n"
 "Other information\n"
 "-----------------\n"
-"If you use Menuconfig in an XTERM window make sure you have your\n"
-"$TERM variable set to point to a xterm definition which supports color.\n"
-"Otherwise, Menuconfig will look rather bad.  Menuconfig will not\n"
-"display correctly in a RXVT window because rxvt displays only one\n"
+"If you use Menuconfig in an XTERM window, make sure you have your\n"
+"$TERM variable set to point to an xterm definition which supports\n"
+"color.  Otherwise, Menuconfig will look rather bad.  Menuconfig will\n"
+"not display correctly in an RXVT window because rxvt displays only one\n"
 "intensity of color, bright.\n"
 "\n"
 "Menuconfig will display larger menus on screens or xterms which are\n"
@@ -148,8 +146,8 @@ static const char mconf_readme[] = N_(
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the options listed in a single menu, rather\n"
-"than the default multimenu hierarchy, run the menuconfig with\n"
+"If you prefer to have all of the options listed in a single menu,\n"
+"rather than the default multimenu hierarchy, run the menuconfig with\n"
 "MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
 "make MENUCONFIG_MODE=single_menu menuconfig\n"
@@ -172,7 +170,7 @@ static const char mconf_readme[] = N_(
 " mono       => selects colors suitable for monochrome displays\n"
 " blackbg    => selects a color scheme with black background\n"
 " classic    => theme with blue background. The classic look\n"
-" bluetitle  => a LCD friendly version of classic. (default)\n"
+" bluetitle  => an LCD friendly version of classic. (default)\n"
 "\n"),
 menu_instructions[] = N_(
         "Arrow keys navigate the menu.  "
@@ -238,24 +236,24 @@ search_help[] = N_(
         "Symbol: FOO [=m]\n"
         "Type  : tristate\n"
         "Prompt: Foo bus is used to drive the bar HW\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, ISA)\n"
         "      -> PCI support (PCI [=y])\n"
         "(1)     -> PCI access mode (<choice> [=y])\n"
+        "  Defined at drivers/pci/Kconfig:47\n"
+        "  Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
         "  Selects: LIBCRC32\n"
-        "  Selected by: BAR\n"
+        "  Selected by: BAR [=n]\n"
         "-----------------------------------------------------------------\n"
         "o The line 'Type:' shows the type of the configuration option for\n"
         "  this symbol (boolean, tristate, string, ...)\n"
         "o The line 'Prompt:' shows the text used in the menu structure for\n"
         "  this symbol\n"
-        "o The 'Defined at' line tell at what file / line number the symbol\n"
+        "o The 'Defined at' line tells at what file / line number the symbol\n"
         "  is defined\n"
-        "o The 'Depends on:' line tell what symbols needs to be defined for\n"
+        "o The 'Depends on:' line tells what symbols need to be defined for\n"
         "  this symbol to be visible in the menu (selectable)\n"
-        "o The 'Location:' lines tell where in the menu structure this symbol\n"
+        "o The 'Location:' lines tells where in the menu structure this symbol\n"
         "  is located\n"
         "    A location followed by a [=y] indicates that this is a\n"
         "    selectable menu item - and the current value is displayed inside\n"
@@ -263,9 +261,9 @@ search_help[] = N_(
         "    Press the key in the (#) prefix to jump directly to that\n"
         "    location. You will be returned to the current search results\n"
         "    after exiting this new menu.\n"
-        "o The 'Selects:' line tell what symbol will be automatically\n"
+        "o The 'Selects:' line tells what symbols will be automatically\n"
         "  selected if this symbol is selected (y or m)\n"
-        "o The 'Selected by' line tell what symbol has selected this symbol\n"
+        "o The 'Selected by' line tells what symbol has selected this symbol\n"
         "\n"
         "Only relevant lines are shown.\n"
         "\n\n"
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index c1d53200c306..db1512ae30cc 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -119,9 +119,10 @@ void menu_set_type(int type)
                 sym->type = type;
                 return;
         }
-        menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'",
-            sym->name ? sym->name : "<choice>",
-            sym_type_name(sym->type), sym_type_name(type));
+        menu_warn(current_entry,
+                "ignoring type redefinition of '%s' from '%s' to '%s'",
+                sym->name ? sym->name : "<choice>",
+                sym_type_name(sym->type), sym_type_name(type));
 }
 
 struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep)
@@ -583,7 +584,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
                 for (j = 4; --i >= 0; j += 2) {
                         menu = submenu[i];
                         if (head && location && menu == location)
-                                jump->offset = r->len - 1;
+                                jump->offset = strlen(r->s);
                         str_printf(r, "%*c-> %s", j, ' ',
                                    _(menu_get_prompt(menu)));
                         if (menu->sym) {
@@ -597,7 +598,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 }
 
 /*
- * get peoperty of type P_SYMBOL
+ * get property of type P_SYMBOL
  */
 static struct property *get_symbol_prop(struct symbol *sym)
 {
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 1500c38f0cca..9d3b04b0769c 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -69,6 +69,11 @@ static inline QString qgettext(const QString& str)
         return QString::fromLocal8Bit(gettext(str.latin1()));
 }
 
+ConfigSettings::ConfigSettings()
+        : QSettings("kernel.org", "qconf")
+{
+}
+
 /**
  * Reads a list of integer values from the application settings.
  */
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 3715b3e7212c..bde0c6b6f9e8 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -32,6 +32,7 @@ class ConfigMainWindow;
 
 class ConfigSettings : public QSettings {
 public:
+        ConfigSettings();
         Q3ValueList<int> readSizes(const QString& key, bool *ok);
         bool writeSizes(const QString& key, const Q3ValueList<int>& value);
 };
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index c9a6775565bf..7caabdb51c64 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1047,7 +1047,7 @@ sym_re_search_free:
  * When we check for recursive dependencies we use a stack to save
  * current state so we can print out relevant info to user.
  * The entries are located on the call stack so no need to free memory.
- * Note inser() remove() must always match to properly clear the stack.
+ * Note insert() remove() must always match to properly clear the stack.
  */
 static struct dep_stack {
         struct dep_stack *prev, *next;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 6555a475453b..1a9f53e535ca 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -68,7 +68,6 @@ static void alloc_string(const char *str, int size)
 }
 %}
 
-ws      [ \n\t]
 n       [A-Za-z0-9_]
 
 %%
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 16e8b50c8fcb..da058da413e7 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -257,6 +257,7 @@ my $man_date = ('January', 'February', 'March', 'April', 'May', 'June',
                 'July', 'August', 'September', 'October',
                 'November', 'December')[(localtime)[4]] .
   " " . ((localtime)[5]+1900);
+my $show_not_found = 0;
 
 # Essentially these are globals.
 # They probably want to be tidied up, made more localised or something.
@@ -369,6 +370,8 @@ while ($ARGV[0] =~ m/^-(.*)/) {
         usage();
     } elsif ($cmd eq '-no-doc-sections') {
             $no_doc_sections = 1;
+    } elsif ($cmd eq '-show-not-found') {
+        $show_not_found = 1;
     }
 }
 
@@ -2535,6 +2538,9 @@ sub process_file($) {
     }
     if ($initial_section_counter == $section_counter) {
         print STDERR "Warning(${file}): no structured comments found\n";
+        if (($function_only == 1) && ($show_not_found == 1)) {
+            print STDERR "    Was looking for '$_'.\n" for keys %function_table;
+        }
         if ($output_mode eq "xml") {
             # The template wants at least one RefEntry here; make one.
             print "<refentry>\n";
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 014994936b1c..32b10f53d0b4 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -82,6 +82,8 @@ kallsyms()
                 kallsymopt="${kallsymopt} --all-symbols"
         fi
 
+        kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+
         local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
                       ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8247979e8f64..17855761e6b7 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <errno.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
@@ -37,6 +38,8 @@ static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+/* ignore missing files */
+static int ignore_missing_files;
 
 enum export {
         export_plain,      export_unused,     export_gpl,
@@ -161,7 +164,7 @@ struct symbol {
         unsigned int vmlinux:1;    /* 1 if symbol is defined in vmlinux */
         unsigned int kernel:1;     /* 1 if symbol is from kernel
                                     *  (only for external modules) **/
-        unsigned int preloaded:1;  /* 1 if symbol from Module.symvers */
+        unsigned int preloaded:1;  /* 1 if symbol from Module.symvers, or crc */
         enum export  export;       /* Type of export */
         char name[0];
 };
@@ -329,8 +332,11 @@ static void sym_update_crc(const char *name, struct module *mod,
 {
         struct symbol *s = find_symbol(name);
 
-        if (!s)
+        if (!s) {
                 s = new_symbol(name, mod, export);
+                /* Don't complain when we find it later. */
+                s->preloaded = 1;
+        }
         s->crc = crc;
         s->crc_valid = 1;
 }
@@ -407,6 +413,11 @@ static int parse_elf(struct elf_info *info, const char *filename)
 
         hdr = grab_file(filename, &info->size);
         if (!hdr) {
+                if (ignore_missing_files) {
+                        fprintf(stderr, "%s: %s (ignored)\n", filename,
+                                strerror(errno));
+                        return 0;
+                }
                 perror(filename);
                 exit(1);
         }
@@ -599,18 +610,17 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
         else
                 export = export_from_sec(info, get_secindex(info, sym));
 
+        /* CRC'd symbol */
+        if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+                crc = (unsigned int) sym->st_value;
+                sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
+                                export);
+        }
+
         switch (sym->st_shndx) {
         case SHN_COMMON:
                 warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
                 break;
-        case SHN_ABS:
-                /* CRC'd symbol */
-                if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
-                        crc = (unsigned int) sym->st_value;
-                        sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
-                                        export);
-                }
-                break;
         case SHN_UNDEF:
                 /* undefined symbol */
                 if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
@@ -1853,7 +1863,7 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "\n");
         buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
         buf_printf(b, "\n");
-        buf_printf(b, "struct module __this_module\n");
+        buf_printf(b, "__visible struct module __this_module\n");
         buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
         buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
         if (mod->has_init)
@@ -2119,7 +2129,7 @@ int main(int argc, char **argv)
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2139,6 +2149,9 @@ int main(int argc, char **argv)
                 case 'm':
                         modversions = 1;
                         break;
+                case 'n':
+                        ignore_missing_files = 1;
+                        break;
                 case 'o':
                         dump_write = optarg;
                         break;
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 9dfcd6d988da..deb2994b04c4 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -416,7 +416,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
                 basename = strrchr(modname, '/') + 1;
         else
                 basename = modname;
-        sprintf(filelist, "%s/%.*s.mod", modverdir,
+        snprintf(filelist, sizeof(filelist), "%s/%.*s.mod", modverdir,
                 (int) strlen(basename) - 2, basename);
 
         file = grab_file(filelist, &len);
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index a4f31c900fa6..c5d473393816 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -115,7 +115,9 @@ git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/         \
         -o $(perf-tar).tar;                                         \
 mkdir -p $(perf-tar);                                               \
 git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD;    \
-tar rf $(perf-tar).tar $(perf-tar)/HEAD;                            \
+(cd $(srctree)/tools/perf;                                          \
+util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null);              \
+tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
 rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
 $(if $(findstring bz2,$@),bzip2,                                    \
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index a674fd5507c1..d0da66396f62 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -214,13 +214,13 @@ $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\S+)";
 $weak_regex = "^[0-9a-fA-F]+\\s+([wW])\\s+(\\S+)";
 $section_regex = "Disassembly of section\\s+(\\S+):";
 $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
-$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
+$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)\$";
 $section_type = '@progbits';
 $mcount_adjust = 0;
 $type = ".long";
 
 if ($arch eq "x86_64") {
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s(mcount|__fentry__)([+-]0x[0-9a-zA-Z]+)?\$";
     $type = ".quad";
     $alignment = 8;
     $mcount_adjust = -1;
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 7c2310c5b996..5f7a8b663cb9 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -152,6 +152,30 @@ static void (*w2)(uint16_t, uint16_t *);
 
 typedef void (*table_sort_t)(char *, int);
 
+/*
+ * Move reserved section indices SHN_LORESERVE..SHN_HIRESERVE out of
+ * the way to -256..-1, to avoid conflicting with real section
+ * indices.
+ */
+#define SPECIAL(i) ((i) - (SHN_HIRESERVE + 1))
+
+static inline int is_shndx_special(unsigned int i)
+{
+        return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
+}
+
+/* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
+static inline unsigned int get_secindex(unsigned int shndx,
+                                        unsigned int sym_offs,
+                                        const Elf32_Word *symtab_shndx_start)
+{
+        if (is_shndx_special(shndx))
+                return SPECIAL(shndx);
+        if (shndx != SHN_XINDEX)
+                return shndx;
+        return r(&symtab_shndx_start[sym_offs]);
+}
+
 /* 32 bit and 64 bit are very similar */
 #include "sortextable.h"
 #define SORTEXTABLE_64
diff --git a/scripts/sortextable.h b/scripts/sortextable.h
index f5eb43d42926..8fac3fd697a6 100644
--- a/scripts/sortextable.h
+++ b/scripts/sortextable.h
@@ -98,6 +98,8 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
         Elf_Shdr *symtab_sec = NULL;
         Elf_Shdr *extab_sec = NULL;
         Elf_Sym *sym;
+        const Elf_Sym *symtab;
+        Elf32_Word *symtab_shndx_start = NULL;
         Elf_Sym *sort_needed_sym;
         Elf_Shdr *sort_needed_sec;
         Elf_Rel *relocs = NULL;
@@ -109,11 +111,22 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
         int extab_index = 0;
         int i;
         int idx;
+        unsigned int num_sections;
+        unsigned int secindex_strings;
 
         shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
-        shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
+
+        num_sections = r2(&ehdr->e_shnum);
+        if (num_sections == SHN_UNDEF)
+                num_sections = _r(&shdr[0].sh_size);
+
+        secindex_strings = r2(&ehdr->e_shstrndx);
+        if (secindex_strings == SHN_XINDEX)
+                secindex_strings = r(&shdr[0].sh_link);
+
+        shstrtab_sec = shdr + secindex_strings;
         secstrtab = (const char *)ehdr + _r(&shstrtab_sec->sh_offset);
-        for (i = 0; i < r2(&ehdr->e_shnum); i++) {
+        for (i = 0; i < num_sections; i++) {
                 idx = r(&shdr[i].sh_name);
                 if (strcmp(secstrtab + idx, "__ex_table") == 0) {
                         extab_sec = shdr + i;
@@ -129,6 +142,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                         symtab_sec = shdr + i;
                 if (strcmp(secstrtab + idx, ".strtab") == 0)
                         strtab_sec = shdr + i;
+                if (r(&shdr[i].sh_type) == SHT_SYMTAB_SHNDX)
+                        symtab_shndx_start = (Elf32_Word *)(
+                                (const char *)ehdr + _r(&shdr[i].sh_offset));
         }
         if (strtab_sec == NULL) {
                 fprintf(stderr, "no .strtab in  file: %s\n", fname);
@@ -138,6 +154,8 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                 fprintf(stderr, "no .symtab in  file: %s\n", fname);
                 fail_file();
         }
+        symtab = (const Elf_Sym *)((const char *)ehdr +
+                                   _r(&symtab_sec->sh_offset));
         if (extab_sec == NULL) {
                 fprintf(stderr, "no __ex_table in  file: %s\n", fname);
                 fail_file();
@@ -176,7 +194,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
                         fname);
                 fail_file();
         }
-        sort_needed_sec = &shdr[r2(&sort_needed_sym->st_shndx)];
+        sort_needed_sec = &shdr[get_secindex(r2(&sym->st_shndx),
+                                             sort_needed_sym - symtab,
+                                             symtab_shndx_start)];
         sort_done_location = (void *)ehdr +
                 _r(&sort_needed_sec->sh_offset) +
                 _r(&sort_needed_sym->st_value) -