Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

5 files changed, 383 insertions, 231 deletions

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 8cd63014a0d1..f98d772aac80 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -108,7 +108,7 @@ quiet_cmd_mkdir		  = MKDIR   $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
 
 quiet_cmd_gen             = GEN     $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
       cmd_gen             = \
-FNAME=$(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$@)                    \
+FNAME=$(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$@);                   \
 STUBDEF=__ASM_STUB_`echo $$FNAME | tr a-z.- A-Z__`;                     \
 (echo "/* File autogenerated by 'make headers_install' */" ;            \
 echo "\#ifndef $$STUBDEF" ;                                             \
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index aea90d30d229..25e20a27fc59 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -9,7 +9,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.04';
+my $V = '0.07';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -17,11 +17,13 @@ my $quiet = 0;
 my $tree = 1;
 my $chk_signoff = 1;
 my $chk_patch = 1;
+my $tst_type = 0;
 GetOptions(
         'q|quiet'       => \$quiet,
         'tree!'         => \$tree,
         'signoff!'      => \$chk_signoff,
         'patch!'        => \$chk_patch,
+        'test-type!'    => \$tst_type,
 ) or exit;
 
 my $exit = 0;
@@ -151,7 +153,7 @@ sub sanitise_line {
 }
 
 sub ctx_block_get {
-        my ($linenr, $remain, $outer) = @_;
+        my ($linenr, $remain, $outer, $open, $close) = @_;
         my $line;
         my $start = $linenr - 1;
         my $blk = '';
@@ -165,8 +167,8 @@ sub ctx_block_get {
 
                 $blk .= $rawlines[$line];
 
-                @o = ($blk =~ /\{/g);
-                @c = ($blk =~ /\}/g);
+                @o = ($blk =~ /$open/g);
+                @c = ($blk =~ /$close/g);
 
                 if (!$outer || (scalar(@o) - scalar(@c)) == 1) {
                         push(@res, $rawlines[$line]);
@@ -180,12 +182,17 @@ sub ctx_block_get {
 sub ctx_block_outer {
         my ($linenr, $remain) = @_;
 
-        return ctx_block_get($linenr, $remain, 1);
+        return ctx_block_get($linenr, $remain, 1, '\{', '\}');
 }
 sub ctx_block {
         my ($linenr, $remain) = @_;
 
-        return ctx_block_get($linenr, $remain, 0);
+        return ctx_block_get($linenr, $remain, 0, '\{', '\}');
+}
+sub ctx_statement {
+        my ($linenr, $remain) = @_;
+
+        return ctx_block_get($linenr, $remain, 0, '\(', '\)');
 }
 
 sub ctx_locate_comment {
@@ -239,6 +246,19 @@ sub cat_vet {
         return $vet;
 }
 
+sub ERROR {
+        print "ERROR: $_[0]\n";
+        our $clean = 0;
+}
+sub WARN {
+        print "WARNING: $_[0]\n";
+        our $clean = 0;
+}
+sub CHK {
+        print "CHECK: $_[0]\n";
+        our $clean = 0;
+}
+
 sub process {
         my $filename = shift;
         my @lines = @_;
@@ -252,7 +272,7 @@ sub process {
         my $previndent=0;
         my $stashindent=0;
 
-        my $clean = 1;
+        our $clean = 1;
         my $signoff = 0;
         my $is_patch = 0;
 
@@ -264,9 +284,64 @@ sub process {
         my $in_comment = 0;
         my $first_line = 0;
 
+        my $Ident       = qr{[A-Za-z\d_]+};
+        my $Storage     = qr{extern|static};
+        my $Sparse      = qr{__user|__kernel|__force|__iomem};
+        my $NonptrType  = qr{
+                                \b
+                                (?:const\s+)?
+                                (?:unsigned\s+)?
+                                (?:
+                                        void|
+                                        char|
+                                        short|
+                                        int|
+                                        long|
+                                        unsigned|
+                                        float|
+                                        double|
+                                        long\s+int|
+                                        long\s+long|
+                                        long\s+long\s+int|
+                                        u8|u16|u32|u64|
+                                        s8|s16|s32|s64|
+                                        struct\s+$Ident|
+                                        union\s+$Ident|
+                                        enum\s+$Ident|
+                                        ${Ident}_t
+                                )
+                                (?:\s+$Sparse)*
+                                \b
+                          }x;
+        my $Type        = qr{
+                                \b$NonptrType\b
+                                (?:\s*\*+\s*const|\s*\*+)?
+                          }x;
+        my $Declare     = qr{(?:$Storage\s+)?$Type};
+        my $Attribute   = qr{__read_mostly|__init|__initdata};
+
+        # Pre-scan the patch looking for any __setup documentation.
+        my @setup_docs = ();
+        my $setup_docs = 0;
+        foreach my $line (@lines) {
+                if ($line=~/^\+\+\+\s+(\S+)/) {
+                        $setup_docs = 0;
+                        if ($1 =~ m@Documentation/kernel-parameters.txt$@) {
+                                $setup_docs = 1;
+                        }
+                        next;
+                }
+
+                if ($setup_docs && $line =~ /^\+/) {
+                        push(@setup_docs, $line);
+                }
+        }
+
         foreach my $line (@lines) {
                 $linenr++;
 
+                my $rawline = $line;
+
 #extract the filename as it passes
                 if ($line=~/^\+\+\+\s+(\S+)/) {
                         $realfile=$1;
@@ -293,6 +368,7 @@ sub process {
 # blank context lines so we need to count that too.
                 if ($line =~ /^( |\+|$)/) {
                         $realline++;
+                        $realcnt-- if ($realcnt != 0);
 
                         # track any sort of multi-line comment.  Obviously if
                         # the added text or context do not include the whole
@@ -317,41 +393,51 @@ sub process {
                         # Track the previous line.
                         ($prevline, $stashline) = ($stashline, $line);
                         ($previndent, $stashindent) = ($stashindent, $indent);
+                } elsif ($realcnt == 1) {
+                        $realcnt--;
                 }
-                $realcnt-- if ($realcnt != 0);
 
 #make up the handle for any error we report on this line
                 $here = "#$linenr: ";
                 $here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
 
                 my $hereline = "$here\n$line\n";
-                my $herecurr = "$here\n$line\n\n";
-                my $hereprev = "$here\n$prevline\n$line\n\n";
+                my $herecurr = "$here\n$line\n";
+                my $hereprev = "$here\n$prevline\n$line\n";
 
 #check the patch for a signoff:
-                if ($line =~ /^\s*Signed-off-by:\s/) {
-                        $signoff++;
-
-                } elsif ($line =~ /^\s*signed-off-by:/i) {
+                if ($line =~ /^\s*signed-off-by:/i) {
                         # This is a signoff, if ugly, so do not double report.
                         $signoff++;
                         if (!($line =~ /^\s*Signed-off-by:/)) {
-                                print "use Signed-off-by:\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                WARN("Signed-off-by: is the preferred form\n" .
+                                        $herecurr);
                         }
                         if ($line =~ /^\s*signed-off-by:\S/i) {
-                                print "need space after Signed-off-by:\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                WARN("need space after Signed-off-by:\n" .
+                                        $herecurr);
                         }
                 }
 
 # Check for wrappage within a valid hunk of the file
                 if ($realcnt != 0 && $line !~ m{^(?:\+|-| |$)}) {
-                        print "patch seems to be corrupt (line wrapped?) [$realcnt]\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("patch seems to be corrupt (line wrapped?)\n" .
+                                $herecurr);
+                }
+
+# UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
+                if (($realfile =~ /^$/ || $line =~ /^\+/) &&
+                     !($line =~ m/^(
+                                [\x09\x0A\x0D\x20-\x7E]              # ASCII
+                                | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+                                |  \xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+                                | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+                                |  \xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+                                |  \xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+                                | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+                                |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+                                )*$/x )) {
+                        ERROR("Invalid UTF-8\n" . $herecurr);
                 }
 
 #ignore lines being removed
@@ -361,17 +447,13 @@ sub process {
                 next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 
 #trailing whitespace
-                if ($line=~/\+.*\S\s+$/) {
-                        my $herevet = "$here\n" . cat_vet($line) . "\n\n";
-                        print "trailing whitespace\n";
-                        print "$herevet";
-                        $clean = 0;
+                if ($line =~ /^\+.*\S\s+$/ || $line =~ /^\+\s+$/) {
+                        my $herevet = "$here\n" . cat_vet($line) . "\n";
+                        ERROR("trailing whitespace\n" . $herevet);
                 }
 #80 column limit
                 if ($line =~ /^\+/ && !($prevline=~/\/\*\*/) && $length > 80) {
-                        print "line over 80 characters\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        WARN("line over 80 characters\n" . $herecurr);
                 }
 
 # check we are in a valid source file *.[hc] if not then ignore this hunk
@@ -380,10 +462,8 @@ sub process {
 # at the beginning of a line any tabs must come first and anything
 # more than 8 must use tabs.
                 if ($line=~/^\+\s* \t\s*\S/ or $line=~/^\+\s*        \s*/) {
-                        my $herevet = "$here\n" . cat_vet($line) . "\n\n";
-                        print "use tabs not spaces\n";
-                        print "$herevet";
-                        $clean = 0;
+                        my $herevet = "$here\n" . cat_vet($line) . "\n";
+                        ERROR("use tabs not spaces\n" . $herevet);
                 }
 
                 #
@@ -392,17 +472,20 @@ sub process {
                 #
                 next if ($in_comment);
 
-                # Remove comments from the line before processing.
+# Remove comments from the line before processing.
                 $line =~ s@/\*.*\*/@@g;
                 $line =~ s@/\*.*@@;
                 $line =~ s@.*\*/@@;
 
-                #
-                # Checks which may be anchored in the context.
-                #
+# Standardise the strings and chars within the input to simplify matching.
+                $line = sanitise_line($line);
+
+#
+# Checks which may be anchored in the context.
+#
 
-                # Check for switch () and associated case and default
-                # statements should be at the same indent.
+# Check for switch () and associated case and default
+# statements should be at the same indent.
                 if ($line=~/\bswitch\s*\(.*\)/) {
                         my $err = '';
                         my $sep = '';
@@ -419,83 +502,104 @@ sub process {
                                 }
                         }
                         if ($err ne '') {
-                                print "switch and case should be at the same indent\n";
-                                print "$here\n$line\n$err\n";
-                                $clean = 0;
+                                ERROR("switch and case should be at the same indent\n$hereline\n$err\n");
+                        }
+                }
+
+# if/while/etc brace do not go on next line, unless defining a do while loop,
+# or if that brace on the next line is for something else
+                if ($line =~ /\b(?:(if|while|for|switch)\s*\(|do\b|else\b)/ && $line !~ /^.#/) {
+                        my @ctx = ctx_statement($linenr, $realcnt);
+                        my $ctx_ln = $linenr + $#ctx + 1;
+                        my $ctx_cnt = $realcnt - $#ctx - 1;
+                        my $ctx = join("\n", @ctx);
+
+                        while ($ctx_cnt > 0 && $lines[$ctx_ln - 1] =~ /^-/) {
+                                $ctx_ln++;
+                                $ctx_cnt--;
+                        }
+                        ##warn "line<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>";
+
+                        if ($ctx !~ /{\s*/ && $ctx_cnt > 0 && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {
+                                ERROR("That { should be on the previous line\n" .
+                                        "$here\n$ctx\n$lines[$ctx_ln - 1]");
                         }
                 }
 
 #ignore lines not being added
                 if ($line=~/^[^\+]/) {next;}
 
-                #
-                # Checks which are anchored on the added line.
-                #
+# TEST: allow direct testing of the type matcher.
+                if ($tst_type && $line =~ /^.$Declare$/) {
+                        ERROR("TEST: is type $Declare\n" . $herecurr);
+                        next;
+                }
+
+#
+# Checks which are anchored on the added line.
+#
+
+# check for malformed paths in #include statements (uses RAW line)
+                if ($rawline =~ m{^.#\s*include\s+[<"](.*)[">]}) {
+                        my $path = $1;
+                        if ($path =~ m{//}) {
+                                ERROR("malformed #include filename\n" .
+                                        $herecurr);
+                        }
+                        # Sanitise this special form of string.
+                        $path = 'X' x length($path);
+                        $line =~ s{\<.*\>}{<$path>};
+                }
 
 # no C99 // comments
                 if ($line =~ m{//}) {
-                        print "do not use C99 // comments\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("do not use C99 // comments\n" . $herecurr);
                 }
                 # Remove C99 comments.
                 $line =~ s@//.*@@;
 
-                # Standardise the strings and chars within the input
-                # to simplify matching.
-                $line = sanitise_line($line);
-
 #EXPORT_SYMBOL should immediately follow its function closing }.
-                if (($line =~ /EXPORT_SYMBOL.*\(.*\)/) ||
-                    ($line =~ /EXPORT_UNUSED_SYMBOL.*\(.*\)/)) {
+                if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) ||
+                    ($line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
+                        my $name = $1;
                         if (($prevline !~ /^}/) &&
                            ($prevline !~ /^\+}/) &&
-                           ($prevline !~ /^ }/)) {
-                                print "EXPORT_SYMBOL(func); should immediately follow its function\n";
-                                print "$herecurr";
-                                $clean = 0;
+                           ($prevline !~ /^ }/) &&
+                           ($prevline !~ /\s$name(?:\s+$Attribute)?\s*(?:;|=)/)) {
+                                WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
                         }
                 }
 
-                # check for static initialisers.
+# check for static initialisers.
                 if ($line=~/\s*static\s.*=\s+(0|NULL);/) {
-                        print "do not initialise statics to 0 or NULL\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("do not initialise statics to 0 or NULL\n" .
+                                $herecurr);
                 }
 
-                # check for new typedefs.
-                if ($line=~/\s*typedef\s/) {
-                        print "do not add new typedefs\n";
-                        print "$herecurr";
-                        $clean = 0;
+# check for new typedefs, only function parameters and sparse annotations
+# make sense.
+                if ($line =~ /\btypedef\s/ &&
+                    $line !~ /\btypedef\s+$Type\s+\(\s*\*$Ident\s*\)\s*\(/ &&
+                    $line !~ /\b__bitwise(?:__|)\b/) {
+                        WARN("do not add new typedefs\n" . $herecurr);
                 }
 
 # * goes on variable not on type
-                my $type = '(?:char|short|int|long|unsigned|float|double|' .
-                           'struct\s+[A-Za-z\d_]+|' .
-                           'union\s+[A-Za-z\d_]+)';
+                if ($line =~ m{\($NonptrType(\*+)(?:\s+const)?\)}) {
+                        ERROR("\"(foo$1)\" should be \"(foo $1)\"\n" .
+                                $herecurr);
 
-                if ($line =~ m{[A-Za-z\d_]+(\*+) [A-Za-z\d_]+}) {
-                        print "\"foo$1 bar\" should be \"foo $1bar\"\n";
-                        print "$herecurr";
-                        $clean = 0;
-                }
-                if ($line =~ m{$type (\*) [A-Za-z\d_]+} ||
-                    $line =~ m{[A-Za-z\d_]+ (\*\*+) [A-Za-z\d_]+}) {
-                        print "\"foo $1 bar\" should be \"foo $1bar\"\n";
-                        print "$herecurr";
-                        $clean = 0;
-                }
-                if ($line =~ m{\([A-Za-z\d_\s]+[A-Za-z\d_](\*+)\)}) {
-                        print "\"(foo$1)\" should be \"(foo $1)\"\n";
-                        print "$herecurr";
-                        $clean = 0;
-                }
-                if ($line =~ m{\([A-Za-z\d_\s]+[A-Za-z\d_]\s+(\*+)\s+\)}) {
-                        print "\"(foo $1 )\" should be \"(foo $1)\"\n";
-                        print "$herecurr";
-                        $clean = 0;
+                } elsif ($line =~ m{\($NonptrType\s+(\*+)(?!\s+const)\s+\)}) {
+                        ERROR("\"(foo $1 )\" should be \"(foo $1)\"\n" .
+                                $herecurr);
+
+                } elsif ($line =~ m{$NonptrType(\*+)(?:\s+const)?\s+[A-Za-z\d_]+}) {
+                        ERROR("\"foo$1 bar\" should be \"foo $1bar\"\n" .
+                                $herecurr);
+
+                } elsif ($line =~ m{$NonptrType\s+(\*+)(?!\s+const)\s+[A-Za-z\d_]+}) {
+                        ERROR("\"foo $1 bar\" should be \"foo $1bar\"\n" .
+                                $herecurr);
                 }
 
 # # no BUG() or BUG_ON()
@@ -524,19 +628,18 @@ sub process {
                                 }
                         }
                         if ($ok == 0) {
-                                print "printk() should include KERN_ facility level\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                WARN("printk() should include KERN_ facility level\n" . $herecurr);
                         }
                 }
 
-#function brace can't be on same line, except for #defines of do while, or if closed on same line
-                if (($line=~/[A-Za-z\d_]+\**\s+\**[A-Za-z\d_]+\(.*\).* {/) and
+# function brace can't be on same line, except for #defines of do while,
+# or if closed on same line
+                if (($line=~/$Type\s*[A-Za-z\d_]+\(.*\).* {/) and
                     !($line=~/\#define.*do\s{/) and !($line=~/}/)) {
-                        print "braces following function declarations go on the next line\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("open brace '{' following function declarations go on the next line\n" . $herecurr);
                 }
+
+# Check operator spacing.
                 # Note we expand the line with the leading + as the real
                 # line will be displayed with the leading + and the tabs
                 # will therefore also expand that way.
@@ -544,7 +647,6 @@ sub process {
                 $opline = expand_tabs($opline);
                 $opline =~ s/^./ /;
                 if (!($line=~/\#\s*include/)) {
-                        # Check operator spacing.
                         my @elements = split(/(<<=|>>=|<=|>=|==|!=|\+=|-=|\*=|\/=|%=|\^=|\|=|&=|->|<<|>>|<|>|=|!|~|&&|\|\||,|\^|\+\+|--|;|&|\||\+|-|\*|\/\/|\/)/, $opline);
                         my $off = 0;
                         for (my $n = 0; $n < $#elements; $n += 2) {
@@ -570,59 +672,60 @@ sub process {
                                 }
 
                                 # Pick up the preceeding and succeeding characters.
-                                my $ca = substr($opline, $off - 1, 1);
+                                my $ca = substr($opline, 0, $off);
                                 my $cc = '';
-                                if (length($opline) > ($off + length($elements[$n]))) {
-                                        $cc = substr($opline, $off + 1 + length($elements[$n]), 1);
+                                if (length($opline) >= ($off + length($elements[$n + 1]))) {
+                                        $cc = substr($opline, $off + length($elements[$n + 1]));
                                 }
+                                my $cb = "$ca$;$cc";
 
                                 my $ctx = "${a}x${c}";
 
                                 my $at = "(ctx:$ctx)";
 
                                 my $ptr = (" " x $off) . "^";
-                                my $hereptr = "$hereline$ptr\n\n";
+                                my $hereptr = "$hereline$ptr\n";
 
                                 ##print "<$s1:$op:$s2> <$elements[$n]:$elements[$n + 1]:$elements[$n + 2]>\n";
 
-                                # We need ; as an operator.  // is a comment.
-                                if ($op eq ';' or $op eq '//') {
+                                # ; should have either the end of line or a space or \ after it
+                                if ($op eq ';') {
+                                        if ($ctx !~ /.x[WEB]/ && $cc !~ /^\\/ &&
+                                            $cc !~ /^;/) {
+                                                ERROR("need space after that '$op' $at\n" . $hereptr);
+                                        }
+
+                                # // is a comment
+                                } elsif ($op eq '//') {
 
                                 # -> should have no spaces
                                 } elsif ($op eq '->') {
                                         if ($ctx =~ /Wx.|.xW/) {
-                                                print "no spaces around that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                                ERROR("no spaces around that '$op' $at\n" . $hereptr);
                                         }
 
                                 # , must have a space on the right.
                                 } elsif ($op eq ',') {
-                                        if ($ctx !~ /.xW|.xE/) {
-                                                print "need space after that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                        if ($ctx !~ /.xW|.xE/ && $cc !~ /^}/) {
+                                                ERROR("need space after that '$op' $at\n" . $hereptr);
                                         }
 
                                 # unary ! and unary ~ are allowed no space on the right
                                 } elsif ($op eq '!' or $op eq '~') {
                                         if ($ctx !~ /[WOEB]x./) {
-                                                print "need space before that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                                ERROR("need space before that '$op' $at\n" . $hereptr);
                                         }
                                         if ($ctx =~ /.xW/) {
-                                                print "no space after that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                                ERROR("no space after that '$op' $at\n" . $hereptr);
                                         }
 
                                 # unary ++ and unary -- are allowed no space on one side.
                                 } elsif ($op eq '++' or $op eq '--') {
-                                        if ($ctx !~ /[WOB]x[^W]|[^W]x[WOB]/) {
-                                                print "need space one side of that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                        if ($ctx !~ /[WOB]x[^W]/ && $ctx !~ /[^W]x[WOBE]/) {
+                                                ERROR("need space one side of that '$op' $at\n" . $hereptr);
+                                        }
+                                        if ($ctx =~ /Wx./ && $cc =~ /^;/) {
+                                                ERROR("no space before that '$op' $at\n" . $hereptr);
                                         }
 
                                 # & is both unary and binary
@@ -639,9 +742,7 @@ sub process {
                                 #
                                 } elsif ($op eq '&' or $op eq '-') {
                                         if ($ctx !~ /VxV|[EW]x[WE]|[EWB]x[VO]/) {
-                                                print "need space before that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                                ERROR("need space before that '$op' $at\n" . $hereptr);
                                         }
 
                                 # * is the same as & only adding:
@@ -650,16 +751,9 @@ sub process {
                                 #       (foo **)
                                 #
                                 } elsif ($op eq '*') {
-                                        if ($ca eq '*') {
-                                                if ($cc =~ /\s/) {
-                                                        print "no space after that '$op' $at\n";
-                                                        print "$hereptr";
-                                                        $clean = 0;
-                                                }
-                                        } elsif ($ctx !~ /VxV|[EW]x[WE]|[EWB]x[VO]|OxV|WxB/) {
-                                                print "need space before that '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                        if ($ca !~ /$Type$/ && $cb !~ /(\*$;|$;\*)/ &&
+                                            $ctx !~ /VxV|[EW]x[WE]|[EWB]x[VO]|OxV|WxB|BxB/) {
+                                                ERROR("need space before that '$op' $at\n" . $hereptr);
                                         }
 
                                 # << and >> may either have or not have spaces both sides
@@ -667,58 +761,51 @@ sub process {
                                          $op eq '^' or $op eq '|')
                                 {
                                         if ($ctx !~ /VxV|WxW|VxE|WxE/) {
-                                                print "need consistent spacing around '$op' $at\n";
-                                                print "$hereptr";
-                                                $clean = 0;
+                                                ERROR("need consistent spacing around '$op' $at\n" .
+                                                        $hereptr);
                                         }
 
                                 # All the others need spaces both sides.
                                 } elsif ($ctx !~ /[EW]x[WE]/) {
-                                        print "need spaces around that '$op' $at\n";
-                                        print "$hereptr";
-                                        $clean = 0;
+                                        ERROR("need spaces around that '$op' $at\n" . $hereptr);
                                 }
                                 $off += length($elements[$n + 1]);
                         }
                 }
 
 #need space before brace following if, while, etc
-                if ($line=~/\(.*\){/) {
-                        print "need a space before the brace\n";
-                        print "$herecurr";
-                        $clean = 0;
+                if ($line =~ /\(.*\){/ || $line =~ /do{/) {
+                        ERROR("need a space before the open brace '{'\n" . $herecurr);
+                }
+
+# closing brace should have a space following it when it has anything
+# on the line
+                if ($line =~ /}(?!(?:,|;|\)))\S/) {
+                        ERROR("need a space after that close brace '}'\n" . $herecurr);
                 }
 
 #goto labels aren't indented, allow a single space however
                 if ($line=~/^.\s+[A-Za-z\d_]+:(?![0-9]+)/ and
                    !($line=~/^. [A-Za-z\d_]+:/) and !($line=~/^.\s+default:/)) {
-                        print "labels should not be indented\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        WARN("labels should not be indented\n" . $herecurr);
                 }
 
 # Need a space before open parenthesis after if, while etc
                 if ($line=~/\b(if|while|for|switch)\(/) {
-                        print "need a space before the open parenthesis\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("need a space before the open parenthesis '('\n" . $herecurr);
                 }
 
 # Check for illegal assignment in if conditional.
-                if ($line=~/\b(if|while)\s*\(.*[^<>!=]=[^=].*\)/) {
+                if ($line=~/\bif\s*\(.*[^<>!=]=[^=].*\)/) {
                         #next if ($line=~/\".*\Q$op\E.*\"/ or $line=~/\'\Q$op\E\'/);
-                        print "do not use assignment in condition\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        ERROR("do not use assignment in if condition\n" . $herecurr);
                 }
 
                 # Check for }<nl>else {, these must be at the same
                 # indent level to be relevant to each other.
                 if ($prevline=~/}\s*$/ and $line=~/^.\s*else\s*/ and
                                                 $previndent == $indent) {
-                        print "else should follow close brace\n";
-                        print "$hereprev";
-                        $clean = 0;
+                        ERROR("else should follow close brace '}'\n" . $hereprev);
                 }
 
 #studly caps, commented out until figure out how to distinguish between use of existing and adding new
@@ -730,89 +817,85 @@ sub process {
 
 #no spaces allowed after \ in define
                 if ($line=~/\#define.*\\\s$/) {
-                        print("Whitepspace after \\ makes next lines useless\n");
-                        print "$herecurr";
-                        $clean = 0;
+                        WARN("Whitepspace after \\ makes next lines useless\n" . $herecurr);
                 }
 
-#warn if <asm/foo.h> is #included and <linux/foo.h> is available.
-                if ($tree && $line =~ qr|\s*\#\s*include\s*\<asm\/(.*)\.h\>|) {
+#warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
+                if ($tree && $rawline =~ m{^.\#\s*include\s*\<asm\/(.*)\.h\>}) {
                         my $checkfile = "include/linux/$1.h";
                         if (-f $checkfile) {
-                                print "Use #include <linux/$1.h> instead of <asm/$1.h>\n";
-                                print $herecurr;
-                                $clean = 0;
+                                CHK("Use #include <linux/$1.h> instead of <asm/$1.h>\n" .
+                                        $herecurr);
                         }
                 }
 
-#if/while/etc brace do not go on next line, unless #defining a do while loop, or if that brace on the next line is for something else
-                if ($prevline=~/\b(if|while|for|switch)\s*\(/) {
-                        my @opened = $prevline=~/\(/g;
-                        my @closed = $prevline=~/\)/g;
-                        my $nr_line = $linenr;
-                        my $remaining = $realcnt - 1;
-                        my $next_line = $line;
-                        my $extra_lines = 0;
-                        my $display_segment = $prevline;
-
-                        while ($remaining > 0 && scalar @opened > scalar @closed) {
-                                $prevline .= $next_line;
-                                $display_segment .= "\n" . $next_line;
-                                $next_line = $lines[$nr_line];
-                                $nr_line++;
-                                $remaining--;
-
-                                @opened = $prevline=~/\(/g;
-                                @closed = $prevline=~/\)/g;
+# if and else should not have general statements after it
+                if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/ &&
+                    $1 !~ /^\s*(?:\sif|{|\\|$)/) {
+                        ERROR("trailing statements should be on next line\n" . $herecurr);
+                }
+
+# multi-statement macros should be enclosed in a do while loop, grab the
+# first statement and ensure its the whole macro if its not enclosed
+# in a known goot container
+                if (($prevline=~/\#define.*\\/) and
+                   !($prevline=~/do\s+{/) and !($prevline=~/\(\{/) and
+                   !($line=~/do.*{/) and !($line=~/\(\{/) and
+                   !($line=~/^.\s*$Declare\s/)) {
+                        # Grab the first statement, if that is the entire macro
+                        # its ok.  This may start either on the #define line
+                        # or the one below.
+                        my $ln = $linenr;
+                        my $cnt = $realcnt;
+
+                        # If the macro starts on the define line start there.
+                        if ($prevline !~ m{^.#\s*define\s*$Ident(?:\([^\)]*\))?\s*\\\s*$}) {
+                                $ln--;
+                                $cnt++;
                         }
-
-                        if (($prevline=~/\b(if|while|for|switch)\s*\(.*\)\s*$/) and ($next_line=~/{/) and
-                           !($next_line=~/\b(if|while|for)/) and !($next_line=~/\#define.*do.*while/)) {
-                                print "That { should be on the previous line\n";
-                                print "$here\n$display_segment\n$next_line\n\n";
-                                $clean = 0;
+                        my @ctx = ctx_statement($ln, $cnt);
+                        my $ctx_ln = $ln + $#ctx + 1;
+                        my $ctx = join("\n", @ctx);
+
+                        # Pull in any empty extension lines.
+                        while ($ctx =~ /\\$/ &&
+                               $lines[$ctx_ln - 1] =~ /^.\s*(?:\\)?$/) {
+                                $ctx .= $lines[$ctx_ln - 1];
+                                $ctx_ln++;
                         }
-                }
 
-#multiline macros should be enclosed in a do while loop
-                if (($prevline=~/\#define.*\\/) and !($prevline=~/do\s+{/) and
-                   !($prevline=~/\(\{/) and ($line=~/;\s*\\/) and
-                   !($line=~/do.*{/) and !($line=~/\(\{/)) {
-                        print "Macros with multiple statements should be enclosed in a do - while loop\n";
-                        print "$hereprev";
-                        $clean = 0;
+                        if ($ctx =~ /\\$/) {
+                                if ($ctx =~ /;/) {
+                                        ERROR("Macros with multiple statements should be enclosed in a do - while loop\n" . "$here\n$ctx\n");
+                                } else {
+                                        ERROR("Macros with complex values should be enclosed in parenthesis\n" . "$here\n$ctx\n");
+                                }
+                        }
                 }
 
-# don't include deprecated include files
+# don't include deprecated include files (uses RAW line)
                 for my $inc (@dep_includes) {
-                        if ($line =~ m@\#\s*include\s*\<$inc>@) {
-                                print "Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n";
-                                print "$herecurr";
-                                $clean = 0;
+                        if ($rawline =~ m@\#\s*include\s*\<$inc>@) {
+                                ERROR("Don't use <$inc>: see Documentation/feature-removal-schedule.txt\n" . $herecurr);
                         }
                 }
 
 # don't use deprecated functions
                 for my $func (@dep_functions) {
                         if ($line =~ /\b$func\b/) {
-                                print "Don't use $func(): see Documentation/feature-removal-schedule.txt\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                ERROR("Don't use $func(): see Documentation/feature-removal-schedule.txt\n" . $herecurr);
                         }
                 }
 
 # no volatiles please
                 if ($line =~ /\bvolatile\b/ && $line !~ /\basm\s+volatile\b/) {
-                        print "Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr);
                 }
 
 # warn about #if 0
                 if ($line =~ /^.#\s*if\s+0\b/) {
-                        print "#if 0 -- if this code redundant remove it\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        CHK("if this code is redundant consider removing it\n" .
+                                $herecurr);
                 }
 
 # warn about #ifdefs in C files
@@ -826,34 +909,47 @@ sub process {
                 if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/) {
                         my $which = $1;
                         if (!ctx_has_comment($first_line, $linenr)) {
-                                print "$1 definition without comment\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                CHK("$1 definition without comment\n" . $herecurr);
                         }
                 }
 # 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)) {
-                                print "memory barrier without comment\n";
-                                print "$herecurr";
-                                $clean = 0;
+                                CHK("memory barrier without comment\n" . $herecurr);
                         }
                 }
 # check of hardware specific defines
                 if ($line =~ m@^.#\s*if.*\b(__i386__|__powerpc64__|__sun__|__s390x__)\b@) {
-                        print "architecture specific defines should be avoided\n";
-                        print "$herecurr";
-                        $clean = 0;
+                        CHK("architecture specific defines should be avoided\n" .  $herecurr);
+                }
+
+# check the location of the inline attribute, that it is between
+# storage class and type.
+                if ($line =~ /$Type\s+(?:inline|__always_inline)\b/ ||
+                    $line =~ /\b(?:inline|always_inline)\s+$Storage/) {
+                        ERROR("inline keyword should sit between storage class and type\n" . $herecurr);
+                }
+
+# check for new externs in .c files.
+                if ($line =~ /^.\s*extern\s/ && ($realfile =~ /\.c$/)) {
+                        WARN("externs should be avoided in .c files\n" .  $herecurr);
+                }
+
+# checks for new __setup's
+                if ($rawline =~ /\b__setup\("([^"]*)"/) {
+                        my $name = $1;
+
+                        if (!grep(/$name/, @setup_docs)) {
+                                CHK("__setup appears un-documented -- check Documentation/kernel-parameters.txt\n" . $herecurr);
+                        }
                 }
         }
 
         if ($chk_patch && !$is_patch) {
-                $clean = 0;
-                print "Does not appear to be a unified-diff format patch\n";
+                ERROR("Does not appear to be a unified-diff format patch\n");
         }
         if ($is_patch && $chk_signoff && $signoff == 0) {
-                $clean = 0;
-                print "Missing Signed-off-by: line(s)\n";
+                ERROR("Missing Signed-off-by: line(s)\n");
         }
 
         if ($clean == 1 && $quiet == 0) {
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index f98171f5a3df..0dcc01ce45a6 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -99,6 +99,11 @@ cat << EOF
 #define __IGNORE_setfsuid32
 #define __IGNORE_setfsgid32
 
+/* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */
+#ifdef __NR_sync_file_range2
+#define __IGNORE_sync_file_range
+#endif
+
 /* Unmerged syscalls for AFS, STREAMS, etc. */
 #define __IGNORE_afs_syscall
 #define __IGNORE_getpmsg
diff --git a/scripts/decodecode b/scripts/decodecode
new file mode 100644
index 000000000000..1e1a8f620c47
--- /dev/null
+++ b/scripts/decodecode
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Disassemble the Code: line in Linux oopses
+# usage: decodecode < oops.file
+#
+# options: set env. variable AFLAGS=options to pass options to "as";
+# e.g., to decode an i386 oops on an x86_64 system, use:
+# AFLAGS=--32 decodecode < 386.oops
+
+T=`mktemp`
+code=
+
+while read i ; do
+
+case "$i" in
+*Code:*)
+        code=$i
+        ;;
+esac
+
+done
+
+if [ -z "$code" ]; then
+        exit
+fi
+
+echo $code
+code=`echo $code | sed -e 's/.*Code: //'`
+
+marker=`expr index "$code" "\<"`
+if [ $marker -eq 0 ]; then
+        marker=`expr index "$code" "\("`
+fi
+
+if [ $marker -ne 0 ]; then
+        beforemark=`echo "$code" | cut -c-$((${marker} - 1))`
+        echo -n "       .byte 0x" > $T.s
+        echo $beforemark | sed -e 's/ /,0x/g' >> $T.s
+        as $AFLAGS -o $T.o $T.s
+        objdump -S $T.o
+        rm $T.o $T.s
+
+# and fix code at-and-after marker
+        code=`echo "$code" | cut -c$((${marker} + 1))-`
+fi
+
+code=`echo $code | sed -e 's/ [<(]/ /;s/[>)] / /;s/ /,0x/g'`
+echo -n "       .byte 0x" > $T.s
+echo $code >> $T.s
+as $AFLAGS -o $T.o $T.s
+objdump -S $T.o
+rm $T.o $T.s
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 8b809b264d18..10b006694e5d 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#define KSYM_NAME_LEN           127
+#define KSYM_NAME_LEN           128
 
 
 struct sym_entry {
@@ -254,7 +254,7 @@ static void write_src(void)
         unsigned int i, k, off;
         unsigned int best_idx[256];
         unsigned int *markers;
-        char buf[KSYM_NAME_LEN+1];
+        char buf[KSYM_NAME_LEN];
 
         printf("#include <asm/types.h>\n");
         printf("#if BITS_PER_LONG == 64\n");