9 files changed, 117 insertions, 286 deletions

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 52cab46ae35a..c5d5db54c009 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -6,5 +6,4 @@ kallsyms
 pnmtologo
 bin2c
 unifdef
-binoffset
 ihex2fw
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cd815ac2a50b..f9bdf264473d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -219,8 +219,13 @@ for F in $1; do								\
         fsize=$$(stat -c "%s" $$F);                                     \
         dec_size=$$(expr $$dec_size + $$fsize);                         \
 done;                                                                   \
-printf "%08x" $$dec_size |                                              \
-        sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g' \
+printf "%08x\n" $$dec_size |                                            \
+        sed 's/\(..\)/\1 /g' | {                                        \
+                read ch0 ch1 ch2 ch3;                                   \
+                for ch in $$ch3 $$ch2 $$ch1 $$ch0; do                   \
+                        printf '%s%03o' '\\' $$((0x$$ch));              \
+                done;                                                   \
+        }                                                               \
 )
 
 quiet_cmd_bzip2 = BZIP2   $@
@@ -235,3 +240,8 @@ quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
         lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
+
+quiet_cmd_lzo = LZO    $@
+cmd_lzo = (cat $(filter-out FORCE,$^) | \
+        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        (rm -f $@ ; false)
diff --git a/scripts/binoffset.c b/scripts/binoffset.c
deleted file mode 100644
index 1a2e39b8e3e5..000000000000
--- a/scripts/binoffset.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/***************************************************************************
- * binoffset.c
- * (C) 2002 Randy Dunlap <rdunlap@xenotime.net>
-
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# binoffset.c:
-# - searches a (binary) file for a specified (binary) pattern
-# - returns the offset of the located pattern or ~0 if not found
-# - exits with exit status 0 normally or non-0 if pattern is not found
-#   or any other error occurs.
-
-****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#define VERSION         "0.1"
-#define BUF_SIZE        (16 * 1024)
-#define PAT_SIZE        100
-
-char            *progname;
-char            *inputname;
-int             inputfd;
-unsigned int    bix;                    /* buf index */
-unsigned char   patterns [PAT_SIZE] = {0}; /* byte-sized pattern array */
-int             pat_len;                /* actual number of pattern bytes */
-unsigned char   *madr;                  /* mmap address */
-size_t          filesize;
-int             num_matches = 0;
-off_t           firstloc = 0;
-
-void usage (void)
-{
-        fprintf (stderr, "%s ver. %s\n", progname, VERSION);
-        fprintf (stderr, "usage:  %s filename pattern_bytes\n",
-                        progname);
-        fprintf (stderr, "        [prints location of pattern_bytes in file]\n");
-        exit (1);
-}
-
-void get_pattern (int pat_count, char *pats [])
-{
-        int ix, err, tmp;
-
-#ifdef DEBUG
-        fprintf (stderr,"get_pattern: count = %d\n", pat_count);
-        for (ix = 0; ix < pat_count; ix++)
-                fprintf (stderr, "  pat # %d:  [%s]\n", ix, pats[ix]);
-#endif
-
-        for (ix = 0; ix < pat_count; ix++) {
-                tmp = 0;
-                err = sscanf (pats[ix], "%5i", &tmp);
-                if (err != 1 || tmp > 0xff) {
-                        fprintf (stderr, "pattern or value error in pattern # %d [%s]\n",
-                                        ix, pats[ix]);
-                        usage ();
-                }
-                patterns [ix] = tmp;
-        }
-        pat_len = pat_count;
-}
-
-void search_pattern (void)
-{
-        for (bix = 0; bix < filesize; bix++) {
-                if (madr[bix] == patterns[0]) {
-                        if (memcmp (&madr[bix], patterns, pat_len) == 0) {
-                                if (num_matches == 0)
-                                        firstloc = bix;
-                                num_matches++;
-                        }
-                }
-        }
-}
-
-#ifdef NOTDEF
-size_t get_filesize (int fd)
-{
-        off_t end_off = lseek (fd, 0, SEEK_END);
-        lseek (fd, 0, SEEK_SET);
-        return (size_t) end_off;
-}
-#endif
-
-size_t get_filesize (int fd)
-{
-        int err;
-        struct stat stat;
-
-        err = fstat (fd, &stat);
-        fprintf (stderr, "filesize: %ld\n", err < 0 ? (long)err : stat.st_size);
-        if (err < 0)
-                return err;
-        return (size_t) stat.st_size;
-}
-
-int main (int argc, char *argv [])
-{
-        progname = argv[0];
-
-        if (argc < 3)
-                usage ();
-
-        get_pattern (argc - 2, argv + 2);
-
-        inputname = argv[1];
-
-        inputfd = open (inputname, O_RDONLY);
-        if (inputfd == -1) {
-                fprintf (stderr, "%s: cannot open '%s'\n",
-                                progname, inputname);
-                exit (3);
-        }
-
-        filesize = get_filesize (inputfd);
-
-        madr = mmap (0, filesize, PROT_READ, MAP_PRIVATE, inputfd, 0);
-        if (madr == MAP_FAILED) {
-                fprintf (stderr, "mmap error = %d\n", errno);
-                close (inputfd);
-                exit (4);
-        }
-
-        search_pattern ();
-
-        if (munmap (madr, filesize))
-                fprintf (stderr, "munmap error = %d\n", errno);
-
-        if (close (inputfd))
-                fprintf (stderr, "%s: error %d closing '%s'\n",
-                                progname, errno, inputname);
-
-        fprintf (stderr, "number of pattern matches = %d\n", num_matches);
-        if (num_matches == 0)
-                firstloc = ~0;
-        printf ("%ld\n", firstloc);
-        fprintf (stderr, "%ld\n", firstloc);
-
-        exit (num_matches ? 0 : 2);
-}
-
-/* end binoffset.c */
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bc4114f1ab30..3257d3d96767 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# (c) 2001, Dave Jones. <davej@redhat.com> (the file handling bit)
+# (c) 2001, Dave Jones. (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
 # (c) 2008,2009, Andy Whitcroft <apw@canonical.com>
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index de233ff43c1c..37f30d36c944 100755
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -1,92 +1,53 @@
 #!/bin/sh
-# extracts .config info from a [b]zImage file
-# uses: binoffset (new), dd, zcat, strings, grep
-# $arg1 is [b]zImage filename
-
-binoffset="./scripts/binoffset"
-test -e $binoffset || cc -o $binoffset ./scripts/binoffset.c || exit 1
-
-IKCFG_ST="0x49 0x4b 0x43 0x46 0x47 0x5f 0x53 0x54"
-IKCFG_ED="0x49 0x4b 0x43 0x46 0x47 0x5f 0x45 0x44"
-dump_config() {
-    file="$1"
-
-    start=`$binoffset $file $IKCFG_ST 2>/dev/null`
-    [ "$?" != "0" ] && start="-1"
-    if [ "$start" -eq "-1" ]; then
-        return
-    fi
-    end=`$binoffset $file $IKCFG_ED 2>/dev/null`
-    [ "$?" != "0" ] && end="-1"
-    if [ "$end" -eq "-1" ]; then
-        return
-    fi
-
-    start=`expr $start + 8`
-    size=`expr $end - $start`
-
-    dd if="$file" ibs=1 skip="$start" count="$size" 2>/dev/null | zcat
-
-    clean_up
-    exit 0
-}
-
-
-usage()
-{
-        echo "  usage: extract-ikconfig [b]zImage_filename"
-}
-
-clean_up()
+# ----------------------------------------------------------------------
+# extract-ikconfig - Extract the .config file from a kernel image
+#
+# This will only work when the kernel was compiled with CONFIG_IKCONFIG.
+#
+# The obscure use of the "tr" filter is to work around older versions of
+# "grep" that report the byte offset of the line instead of the pattern.
+#
+# (c) 2009, Dick Streefland <dick@streefland.net>
+# Licensed under the terms of the GNU General Public License.
+# ----------------------------------------------------------------------
+
+gz1='\037\213\010'
+gz2='01'
+cf1='IKCFG_ST\037\213\010'
+cf2='0123456789'
+
+dump_config()
 {
-        if [ "$TMPFILE" != "" ]; then
-                rm -f $TMPFILE
+        if      pos=`tr "$cf1\n$cf2" "\n$cf2=" < "$1" | grep -abo "^$cf2"`
+        then
+                pos=${pos%%:*}
+                tail -c+$(($pos+8)) "$1" | zcat -q
+                exit 0
         fi
 }
 
-if [ $# -lt 1 ]
+# Check invocation:
+me=${0##*/}
+img=$1
+if      [ $# -ne 1 -o ! -s "$img" ]
 then
-        usage
-        exit 1
+        echo "Usage: $me <kernel-image>" >&2
+        exit 2
 fi
 
-TMPFILE=`mktemp -t ikconfig-XXXXXX` || exit 1
-image="$1"
-
-# vmlinux: Attempt to dump the configuration from the file directly
-dump_config "$image"
-
-GZHDR1="0x1f 0x8b 0x08 0x00"
-GZHDR2="0x1f 0x8b 0x08 0x08"
-
-ELFHDR="0x7f 0x45 0x4c 0x46"
-
-# vmlinux.gz: Check for a compressed images
-off=`$binoffset "$image" $GZHDR1 2>/dev/null`
-[ "$?" != "0" ] && off="-1"
-if [ "$off" -eq "-1" ]; then
-        off=`$binoffset "$image" $GZHDR2 2>/dev/null`
-        [ "$?" != "0" ] && off="-1"
-fi
-if [ "$off" -eq "0" ]; then
-        zcat <"$image" >"$TMPFILE"
-        dump_config "$TMPFILE"
-elif [ "$off" -ne "-1" ]; then
-        (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \
-                zcat >"$TMPFILE"
-        dump_config "$TMPFILE"
-
-# check if this is simply an ELF file
-else
-        off=`$binoffset "$image" $ELFHDR 2>/dev/null`
-        [ "$?" != "0" ] && off="-1"
-        if [ "$off" -eq "0" ]; then
-                dump_config "$image"
-        fi
-fi
-
-echo "ERROR: Unable to extract kernel configuration information."
-echo "       This kernel image may not have the config info."
-
-clean_up
+# Initial attempt for uncompressed images or objects:
+dump_config "$img"
+
+# That didn't work, so decompress and try again:
+tmp=/tmp/ikconfig$$
+trap "rm -f $tmp" 0
+for     pos in `tr "$gz1\n$gz2" "\n$gz2=" < "$img" | grep -abo "^$gz2"`
+do
+        pos=${pos%%:*}
+        tail -c+$pos "$img" | zcat 2> /dev/null > $tmp
+        dump_config $tmp
+done
+
+# Bail out:
+echo "$me: Cannot find kernel config." >&2
 exit 1
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 445e8845f0a4..2f3230db7ffb 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -74,8 +74,8 @@ my %VCS_cmds;
 my %VCS_cmds_git = (
     "execute_cmd" => \&git_execute_cmd,
     "available" => '(which("git") ne "") && (-d ".git")',
-    "find_signers_cmd" => "git log --since=\$email_git_since -- \$file",
-    "find_commit_signers_cmd" => "git log -1 \$commit",
+    "find_signers_cmd" => "git log --no-color --since=\$email_git_since -- \$file",
+    "find_commit_signers_cmd" => "git log --no-color -1 \$commit",
     "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file",
     "blame_file_cmd" => "git blame -l \$file",
     "commit_pattern" => "^commit [0-9a-f]{40,40}",
@@ -296,46 +296,56 @@ my @status = ();
 
 foreach my $file (@files) {
 
-#Do not match excluded file patterns
-
-    my $exclude = 0;
-    foreach my $line (@typevalue) {
-        if ($line =~ m/^(\C):\s*(.*)/) {
-            my $type = $1;
-            my $value = $2;
-            if ($type eq 'X') {
-                if (file_match_pattern($file, $value)) {
-                    $exclude = 1;
-                    last;
-                }
-            }
-        }
-    }
+    my %hash;
+    my $tvi = find_first_section();
+    while ($tvi < @typevalue) {
+        my $start = find_starting_index($tvi);
+        my $end = find_ending_index($tvi);
+        my $exclude = 0;
+        my $i;
+
+        #Do not match excluded file patterns
 
-    if (!$exclude) {
-        my $tvi = 0;
-        my %hash;
-        foreach my $line (@typevalue) {
+        for ($i = $start; $i < $end; $i++) {
+            my $line = $typevalue[$i];
             if ($line =~ m/^(\C):\s*(.*)/) {
                 my $type = $1;
                 my $value = $2;
-                if ($type eq 'F') {
+                if ($type eq 'X') {
                     if (file_match_pattern($file, $value)) {
-                        my $value_pd = ($value =~ tr@/@@);
-                        my $file_pd = ($file  =~ tr@/@@);
-                        $value_pd++ if (substr($value,-1,1) ne "/");
-                        if ($pattern_depth == 0 ||
-                            (($file_pd - $value_pd) < $pattern_depth)) {
-                            $hash{$tvi} = $value_pd;
-                        }
+                        $exclude = 1;
                     }
                 }
             }
-            $tvi++;
         }
-        foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
-            add_categories($line);
+
+        if (!$exclude) {
+            for ($i = $start; $i < $end; $i++) {
+                my $line = $typevalue[$i];
+                if ($line =~ m/^(\C):\s*(.*)/) {
+                    my $type = $1;
+                    my $value = $2;
+                    if ($type eq 'F') {
+                        if (file_match_pattern($file, $value)) {
+                            my $value_pd = ($value =~ tr@/@@);
+                            my $file_pd = ($file  =~ tr@/@@);
+                            $value_pd++ if (substr($value,-1,1) ne "/");
+                            if ($pattern_depth == 0 ||
+                                (($file_pd - $value_pd) < $pattern_depth)) {
+                                $hash{$tvi} = $value_pd;
+                            }
+                        }
+                    }
+                }
+            }
         }
+
+        $tvi += ($end - $start);
+
+    }
+
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+        add_categories($line);
     }
 
     if ($email && $email_git) {
@@ -570,6 +580,20 @@ sub format_email {
     return $formatted_email;
 }
 
+sub find_first_section {
+    my $index = 0;
+
+    while ($index < @typevalue) {
+        my $tv = $typevalue[$index];
+        if (($tv =~ m/^(\C):\s*(.*)/)) {
+            last;
+        }
+        $index++;
+    }
+
+    return $index;
+}
+
 sub find_starting_index {
     my ($index) = @_;
 
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 5f0fcb712e29..e950f9cde019 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -154,11 +154,11 @@ while (<STDIN>) {
         if ($line =~ /RIP: 0010:\[\<([a-z0-9]+)\>\]/) {
                 $target = $1;
         }
-        if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) {
+        if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) {
                 $function = $1;
                 $func_offset = $2;
         }
-        if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\]  \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) {
+        if ($line =~ /RIP: 0010:\[\<[0-9a-f]+\>\]  \[\<[0-9a-f]+\>\] ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) {
                 $function = $1;
                 $func_offset = $2;
         }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 6f426afbc522..220213e603db 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -804,7 +804,7 @@ static inline int sym_is(const char *symbol, const char *name)
         match = strstr(symbol, name);
         if (!match)
                 return 0;
-        return match[strlen(symbol)] == '\0';
+        return match[strlen(name)] == '\0';
 }
 
 static void do_table(void *symval, unsigned long size,
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 92f09fe9639e..ea6f6e3adaea 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -194,7 +194,7 @@ sub check_objcopy
     }
 }
 
-if ($arch eq "x86") {
+if ($arch =~ /(x86(_64)?)|(i386)/) {
     if ($bits == 64) {
         $arch = "x86_64";
     } else {