Merge branch 'linus' into tracing/ftrace

5 files changed, 209 insertions, 111 deletions

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index a098a0454dc8..17092d6c7db3 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -43,7 +43,13 @@ _modpost: __modpost
 include include/config/auto.conf
 include scripts/Kbuild.include
 
+# When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info
 ifneq ($(KBUILD_EXTMOD),)
+
+# set src + obj - they may be used when building the .mod.c file
+obj := $(KBUILD_EXTMOD)
+src := $(obj)
+
 # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
 include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
              $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b6bbbcdc557e..6971bf078d13 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -9,7 +9,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.18';
+my $V = '0.19';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -115,6 +115,7 @@ our $Attribute	= qr{
                         __kprobes|
                         __(?:mem|cpu|dev|)(?:initdata|init)
                   }x;
+our $Modifier;
 our $Inline     = qr{inline|__always_inline|noinline};
 our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
 our $Lval       = qr{$Ident(?:$Member)*};
@@ -144,17 +145,17 @@ our $UTF8	= qr {
 
 our @typeList = (
         qr{void},
-        qr{char},
-        qr{short},
-        qr{int},
-        qr{long},
+        qr{(?:unsigned\s+)?char},
+        qr{(?:unsigned\s+)?short},
+        qr{(?:unsigned\s+)?int},
+        qr{(?:unsigned\s+)?long},
+        qr{(?:unsigned\s+)?long\s+int},
+        qr{(?:unsigned\s+)?long\s+long},
+        qr{(?:unsigned\s+)?long\s+long\s+int},
         qr{unsigned},
         qr{float},
         qr{double},
         qr{bool},
-        qr{long\s+int},
-        qr{long\s+long},
-        qr{long\s+long\s+int},
         qr{(?:__)?(?:u|s|be|le)(?:8|16|32|64)},
         qr{struct\s+$Ident},
         qr{union\s+$Ident},
@@ -163,26 +164,29 @@ our @typeList = (
         qr{${Ident}_handler},
         qr{${Ident}_handler_fn},
 );
+our @modifierList = (
+        qr{fastcall},
+);
 
 sub build_types {
+        my $mods = "(?:  \n" . join("|\n  ", @modifierList) . "\n)";
         my $all = "(?:  \n" . join("|\n  ", @typeList) . "\n)";
         $NonptrType     = qr{
-                        \b
                         (?:const\s+)?
-                        (?:unsigned\s+)?
+                        (?:$mods\s+)?
                         (?:
-                                $all|
-                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)
+                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
+                                (?:${all}\b)
                         )
                         (?:\s+$Sparse|\s+const)*
-                        \b
                   }x;
         $Type   = qr{
-                        \b$NonptrType\b
+                        $NonptrType
                         (?:\s*\*+\s*const|\s*\*+|(?:\s*\[\s*\])+)?
-                        (?:\s+$Inline|\s+$Sparse|\s+$Attribute)*
+                        (?:\s+$Inline|\s+$Sparse|\s+$Attribute|\s+$mods)*
                   }x;
         $Declare        = qr{(?:$Storage\s+)?$Type};
+        $Modifier       = qr{(?:$Attribute|$Sparse|$mods)};
 }
 build_types();
 
@@ -329,7 +333,7 @@ sub sanitise_line {
                         $off++;
                         next;
                 }
-                if (substr($line, $off, 2) eq $sanitise_quote) {
+                if (substr($line, $off, 2) eq '*/') {
                         $sanitise_quote = '';
                         substr($res, $off, 2, "$;$;");
                         $off++;
@@ -366,14 +370,14 @@ sub sanitise_line {
         }
 
         # The pathname on a #include may be surrounded by '<' and '>'.
-        if ($res =~ /^.#\s*include\s+\<(.*)\>/) {
+        if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
                 my $clean = 'X' x length($1);
                 $res =~ s@\<.*\>@<$clean>@;
 
         # The whole of a #error is a string.
-        } elsif ($res =~ /^.#\s*(?:error|warning)\s+(.*)\b/) {
+        } elsif ($res =~ /^.\s*\#\s*(?:error|warning)\s+(.*)\b/) {
                 my $clean = 'X' x length($1);
-                $res =~ s@(#\s*(?:error|warning)\s+).*@$1$clean@;
+                $res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
         }
 
         return $res;
@@ -715,7 +719,7 @@ sub annotate_values {
                         print "DECLARE($1)\n" if ($dbg_values > 1);
                         $type = 'T';
 
-                } elsif ($cur =~ /^(#\s*define\s*$Ident)(\(?)/o) {
+                } elsif ($cur =~ /^(\#\s*define\s*$Ident)(\(?)/o) {
                         print "DEFINE($1,$2)\n" if ($dbg_values > 1);
                         $av_preprocessor = 1;
                         push(@av_paren_type, $type);
@@ -724,12 +728,12 @@ sub annotate_values {
                         }
                         $type = 'E';
 
-                } elsif ($cur =~ /^(#\s*undef\s*$Ident)/o) {
+                } elsif ($cur =~ /^(\#\s*(?:undef\s*$Ident|include\b))/o) {
                         print "UNDEF($1)\n" if ($dbg_values > 1);
                         $av_preprocessor = 1;
                         push(@av_paren_type, $type);
 
-                } elsif ($cur =~ /^(#\s*(?:ifdef|ifndef|if))/o) {
+                } elsif ($cur =~ /^(\#\s*(?:ifdef|ifndef|if))/o) {
                         print "PRE_START($1)\n" if ($dbg_values > 1);
                         $av_preprocessor = 1;
 
@@ -737,7 +741,7 @@ sub annotate_values {
                         push(@av_paren_type, $type);
                         $type = 'E';
 
-                } elsif ($cur =~ /^(#\s*(?:else|elif))/o) {
+                } elsif ($cur =~ /^(\#\s*(?:else|elif))/o) {
                         print "PRE_RESTART($1)\n" if ($dbg_values > 1);
                         $av_preprocessor = 1;