17 files changed, 662 insertions, 351 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9d761c95eca2..e3bfcbe8a520 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -227,7 +227,7 @@ our $Inline	= qr{inline|__always_inline|noinline};
 our $Member     = qr{->$Ident|\.$Ident|\[[^]]*\]};
 our $Lval       = qr{$Ident(?:$Member)*};
 
-our $Constant   = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
+our $Constant   = qr{(?i:(?:[0-9]+|0x[0-9a-f]+)[ul]*)};
 our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
 our $Compare    = qr{<=|>=|==|!=|<|>};
 our $Operators  = qr{
@@ -240,9 +240,8 @@ our $NonptrType;
 our $Type;
 our $Declare;
 
-our $UTF8       = qr {
-        [\x09\x0A\x0D\x20-\x7E]              # ASCII
-        | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+our $NON_ASCII_UTF8     = qr{
+        [\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
@@ -251,6 +250,11 @@ our $UTF8	= qr {
         |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
 
+our $UTF8       = qr{
+        [\x09\x0A\x0D\x20-\x7E]              # ASCII
+        | $NON_ASCII_UTF8
+}x;
+
 our $typeTypedefs = qr{(?x:
         (?:__)?(?:u|s|be|le)(?:8|16|32|64)|
         atomic_t
@@ -311,7 +315,7 @@ sub build_types {
         $NonptrType     = qr{
                         (?:$Modifier\s+|const\s+)*
                         (?:
-                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
+                                (?:typeof|__typeof__)\s*\([^\)]*\)|
                                 (?:$typeTypedefs\b)|
                                 (?:${all}\b)
                         )
@@ -330,6 +334,7 @@ our $match_balanced_parentheses = qr/(\((?:[^\(\)]+|(-1))*\))/;
 
 our $Typecast   = qr{\s*(\(\s*$NonptrType\s*\)){0,1}\s*};
 our $LvalOrFunc = qr{($Lval)\s*($match_balanced_parentheses{0,1})\s*};
+our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant)};
 
 sub deparenthesize {
         my ($string) = @_;
@@ -672,6 +677,10 @@ sub ctx_statement_block {
                         if ($off >= $len) {
                                 last;
                         }
+                        if ($level == 0 && substr($blk, $off) =~ /^.\s*#\s*define/) {
+                                $level++;
+                                $type = '#';
+                        }
                 }
                 $p = $c;
                 $c = substr($blk, $off, 1);
@@ -734,6 +743,13 @@ sub ctx_statement_block {
                                 last;
                         }
                 }
+                # Preprocessor commands end at the newline unless escaped.
+                if ($type eq '#' && $c eq "\n" && $p ne "\\") {
+                        $level--;
+                        $type = '';
+                        $off++;
+                        last;
+                }
                 $off++;
         }
         # We are truly at the end, so shuffle to the next line.
@@ -1016,7 +1032,7 @@ sub annotate_values {
                 } elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') {
                         print "CAST($1)\n" if ($dbg_values > 1);
                         push(@av_paren_type, $type);
-                        $type = 'C';
+                        $type = 'c';
 
                 } elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) {
                         print "DECLARE($1)\n" if ($dbg_values > 1);
@@ -1208,7 +1224,9 @@ sub possible {
                         case|
                         else|
                         asm|__asm__|
-                        do
+                        do|
+                        \#|
+                        \#\#|
                 )(?:\s|$)|
                 ^(?:typedef|struct|enum)\b
             )}x;
@@ -1330,6 +1348,9 @@ sub process {
         my $signoff = 0;
         my $is_patch = 0;
 
+        my $in_header_lines = 1;
+        my $in_commit_log = 0;          #Scanning lines before patch
+
         our @report = ();
         our $cnt_lines = 0;
         our $cnt_error = 0;
@@ -1352,6 +1373,7 @@ sub process {
         my %suppress_ifbraces;
         my %suppress_whiletrailers;
         my %suppress_export;
+        my $suppress_statement = 0;
 
         # Pre-scan the patch sanitizing the lines.
         # Pre-scan the patch looking for any __setup documentation.
@@ -1461,6 +1483,7 @@ sub process {
                         %suppress_ifbraces = ();
                         %suppress_whiletrailers = ();
                         %suppress_export = ();
+                        $suppress_statement = 0;
                         next;
 
 # track the line number as we move through the hunk, note that
@@ -1497,10 +1520,11 @@ sub process {
                 if ($line =~ /^diff --git.*?(\S+)$/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
-
+                        $in_commit_log = 0;
                 } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
                         $realfile = $1;
                         $realfile =~ s@^([^/]*)/@@;
+                        $in_commit_log = 0;
 
                         $p1_prefix = $1;
                         if (!$file && $tree && $p1_prefix ne '' &&
@@ -1536,10 +1560,12 @@ sub process {
 # Check the patch for a signoff:
                 if ($line =~ /^\s*signed-off-by:/i) {
                         $signoff++;
+                        $in_commit_log = 0;
                 }
 
 # Check signature styles
-                if ($line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
+                if (!$in_header_lines &&
+                    $line =~ /^(\s*)($signature_tags)(\s*)(.*)/) {
                         my $space_before = $1;
                         my $sign_off = $2;
                         my $space_after = $3;
@@ -1613,6 +1639,21 @@ sub process {
                             "Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
                 }
 
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+                if ($in_header_lines && $realfile =~ /^$/ &&
+                    $rawline !~ /^(commit\b|from\b|[\w-]+:).+$/i) {
+                        $in_header_lines = 0;
+                        $in_commit_log = 1;
+                }
+
+# Still not yet in a patch, check for any UTF-8
+                if ($in_commit_log && $realfile =~ /^$/ &&
+                    $rawline =~ /$NON_ASCII_UTF8/) {
+                        CHK("UTF8_BEFORE_PATCH",
+                            "8-bit UTF-8 used in possible commit log\n" . $herecurr);
+                }
+
 # ignore non-hunk lines and lines being removed
                 next if (!$hunk_line || $line =~ /^-/);
 
@@ -1633,19 +1674,26 @@ sub process {
 # Only applies when adding the entry originally, after that we do not have
 # sufficient context to determine whether it is indeed long enough.
                 if ($realfile =~ /Kconfig/ &&
-                    $line =~ /\+\s*(?:---)?help(?:---)?$/) {
+                    $line =~ /.\s*config\s+/) {
                         my $length = 0;
                         my $cnt = $realcnt;
                         my $ln = $linenr + 1;
                         my $f;
+                        my $is_start = 0;
                         my $is_end = 0;
-                        while ($cnt > 0 && defined $lines[$ln - 1]) {
+                        for (; $cnt > 0 && defined $lines[$ln - 1]; $ln++) {
                                 $f = $lines[$ln - 1];
                                 $cnt-- if ($lines[$ln - 1] !~ /^-/);
                                 $is_end = $lines[$ln - 1] =~ /^\+/;
-                                $ln++;
 
                                 next if ($f =~ /^-/);
+
+                                if ($lines[$ln - 1] =~ /.\s*(?:bool|tristate)\s*\"/) {
+                                        $is_start = 1;
+                                } elsif ($lines[$ln - 1] =~ /.\s*(?:---)?help(?:---)?$/) {
+                                        $length = -1;
+                                }
+
                                 $f =~ s/^.//;
                                 $f =~ s/#.*//;
                                 $f =~ s/^\s+//;
@@ -1657,8 +1705,22 @@ sub process {
                                 $length++;
                         }
                         WARN("CONFIG_DESCRIPTION",
-                             "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_end && $length < 4);
-                        #print "is_end<$is_end> length<$length>\n";
+                             "please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($is_start && $is_end && $length < 4);
+                        #print "is_start<$is_start> is_end<$is_end> length<$length>\n";
+                }
+
+                if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
+                    ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
+                        my $flag = $1;
+                        my $replacement = {
+                                'EXTRA_AFLAGS' =>   'asflags-y',
+                                'EXTRA_CFLAGS' =>   'ccflags-y',
+                                'EXTRA_CPPFLAGS' => 'cppflags-y',
+                                'EXTRA_LDFLAGS' =>  'ldflags-y',
+                        };
+
+                        WARN("DEPRECATED_VARIABLE",
+                             "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement->{$flag});
                 }
 
 # check we are in a valid source file if not then ignore this hunk
@@ -1756,12 +1818,24 @@ sub process {
 # Check for potential 'bare' types
                 my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
                     $realline_next);
-                if ($realcnt && $line =~ /.\s*\S/) {
+#print "LINE<$line>\n";
+                if ($linenr >= $suppress_statement &&
+                    $realcnt && $line =~ /.\s*\S/) {
                         ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                 ctx_statement_block($linenr, $realcnt, 0);
                         $stat =~ s/\n./\n /g;
                         $cond =~ s/\n./\n /g;
 
+#print "linenr<$linenr> <$stat>\n";
+                        # If this statement has no statement boundaries within
+                        # it there is no point in retrying a statement scan
+                        # until we hit end of it.
+                        my $frag = $stat; $frag =~ s/;+\s*$//;
+                        if ($frag !~ /(?:{|;)/) {
+#print "skip<$line_nr_next>\n";
+                                $suppress_statement = $line_nr_next;
+                        }
+
                         # Find the real next line.
                         $realline_next = $line_nr_next;
                         if (defined $realline_next &&
@@ -1887,6 +1961,9 @@ sub process {
 
 # Check relative indent for conditionals and blocks.
                 if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+                                ctx_statement_block($linenr, $realcnt, 0)
+                                        if (!defined $stat);
                         my ($s, $c) = ($stat, $cond);
 
                         substr($s, 0, length($c), '');
@@ -2054,7 +2131,7 @@ sub process {
                         #   XXX(foo);
                         #   EXPORT_SYMBOL(something_foo);
                         my $name = $1;
-                        if ($stat =~ /^.([A-Z_]+)\s*\(\s*($Ident)/ &&
+                        if ($stat =~ /^(?:.\s*}\s*\n)?.([A-Z_]+)\s*\(\s*($Ident)/ &&
                             $name =~ /^${Ident}_$2/) {
 #print "FOO C name<$name>\n";
                                 $suppress_export{$realline_next} = 1;
@@ -2132,8 +2209,9 @@ sub process {
 
 # * goes on variable not on type
                 # (char*[ const])
-                if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
-                        my ($from, $to) = ($1, $1);
+                while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) {
+                        #print "AA<$1>\n";
+                        my ($from, $to) = ($2, $2);
 
                         # Should start with a space.
                         $to =~ s/^(\S)/ $1/;
@@ -2148,8 +2226,10 @@ sub process {
                                 ERROR("POINTER_LOCATION",
                                       "\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr);
                         }
-                } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
-                        my ($from, $to, $ident) = ($1, $1, $2);
+                }
+                while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) {
+                        #print "BB<$1>\n";
+                        my ($from, $to, $ident) = ($2, $2, $3);
 
                         # Should start with a space.
                         $to =~ s/^(\S)/ $1/;
@@ -2532,7 +2612,7 @@ sub process {
                         # Flatten any parentheses
                         $value =~ s/\(/ \(/g;
                         $value =~ s/\)/\) /g;
-                        while ($value =~ s/\[[^\{\}]*\]/1/ ||
+                        while ($value =~ s/\[[^\[\]]*\]/1/ ||
                                $value !~ /(?:$Ident|-?$Constant)\s*
                                              $Compare\s*
                                              (?:$Ident|-?$Constant)/x &&
@@ -2557,27 +2637,6 @@ sub process {
                         }
                 }
 
-# typecasts on min/max could be min_t/max_t
-                if ($line =~ /^\+(?:.*?)\b(min|max)\s*\($Typecast{0,1}($LvalOrFunc)\s*,\s*$Typecast{0,1}($LvalOrFunc)\s*\)/) {
-                        if (defined $2 || defined $8) {
-                                my $call = $1;
-                                my $cast1 = deparenthesize($2);
-                                my $arg1 = $3;
-                                my $cast2 = deparenthesize($8);
-                                my $arg2 = $9;
-                                my $cast;
-
-                                if ($cast1 ne "" && $cast2 ne "") {
-                                        $cast = "$cast1 or $cast2";
-                                } elsif ($cast1 ne "") {
-                                        $cast = $cast1;
-                                } else {
-                                        $cast = $cast2;
-                                }
-                                WARN("$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . $herecurr);
-                        }
-                }
-
 # Need a space before open parenthesis after if, while etc
                 if ($line=~/\b(if|while|for|switch)\(/) {
                         ERROR("SPACING", "space required before the open parenthesis '('\n" . $herecurr);
@@ -2586,6 +2645,9 @@ sub process {
 # Check for illegal assignment in if conditional -- and check for trailing
 # statements after the conditional.
                 if ($line =~ /do\s*(?!{)/) {
+                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+                                ctx_statement_block($linenr, $realcnt, 0)
+                                        if (!defined $stat);
                         my ($stat_next) = ctx_statement_block($line_nr_next,
                                                 $remain_next, $off_next);
                         $stat_next =~ s/\n./\n /g;
@@ -2741,47 +2803,13 @@ sub process {
                         my $cnt = $realcnt;
                         my ($off, $dstat, $dcond, $rest);
                         my $ctx = '';
-
-                        my $args = defined($1);
-
-                        # Find the end of the macro and limit our statement
-                        # search to that.
-                        while ($cnt > 0 && defined $lines[$ln - 1] &&
-                                $lines[$ln - 1] =~ /^(?:-|..*\\$)/)
-                        {
-                                $ctx .= $rawlines[$ln - 1] . "\n";
-                                $cnt-- if ($lines[$ln - 1] !~ /^-/);
-                                $ln++;
-                        }
-                        $ctx .= $rawlines[$ln - 1];
-
                         ($dstat, $dcond, $ln, $cnt, $off) =
-                                ctx_statement_block($linenr, $ln - $linenr + 1, 0);
+                                ctx_statement_block($linenr, $realcnt, 0);
+                        $ctx = $dstat;
                         #print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
                         #print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
 
-                        # Extract the remainder of the define (if any) and
-                        # rip off surrounding spaces, and trailing \'s.
-                        $rest = '';
-                        while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
-                                #print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
-                                if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
-                                        $rest .= substr($lines[$ln - 1], $off) . "\n";
-                                        $cnt--;
-                                }
-                                $ln++;
-                                $off = 0;
-                        }
-                        $rest =~ s/\\\n.//g;
-                        $rest =~ s/^\s*//s;
-                        $rest =~ s/\s*$//s;
-
-                        # Clean up the original statement.
-                        if ($args) {
-                                substr($dstat, 0, length($dcond), '');
-                        } else {
-                                $dstat =~ s/^.\s*\#\s*define\s+$Ident\s*//;
-                        }
+                        $dstat =~ s/^.\s*\#\s*define\s+$Ident(?:\([^\)]*\))?\s*//;
                         $dstat =~ s/$;//g;
                         $dstat =~ s/\\\n.//g;
                         $dstat =~ s/^\s*//s;
@@ -2790,7 +2818,7 @@ sub process {
                         # Flatten any parentheses and braces
                         while ($dstat =~ s/\([^\(\)]*\)/1/ ||
                                $dstat =~ s/\{[^\{\}]*\}/1/ ||
-                               $dstat =~ s/\[[^\{\}]*\]/1/)
+                               $dstat =~ s/\[[^\[\]]*\]/1/)
                         {
                         }
 
@@ -2807,23 +2835,32 @@ sub process {
                                 ^\"|\"$
                         }x;
                         #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
-                        if ($rest ne '' && $rest ne ',') {
-                                if ($rest !~ /while\s*\(/ &&
-                                    $dstat !~ /$exceptions/)
-                                {
-                                        ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
-                                              "Macros with multiple statements should be enclosed in a do - while loop\n" . "$here\n$ctx\n");
+                        if ($dstat ne '' &&
+                            $dstat !~ /^(?:$Ident|-?$Constant),$/ &&                    # 10, // foo(),
+                            $dstat !~ /^(?:$Ident|-?$Constant);$/ &&                    # foo();
+                            $dstat !~ /^(?:$Ident|-?$Constant)$/ &&                     # 10 // foo()
+                            $dstat !~ /$exceptions/ &&
+                            $dstat !~ /^\.$Ident\s*=/ &&                                # .foo =
+                            $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&       # do {...} while (...); // do {...} while (...)
+                            $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
+                            $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
+                            $dstat !~ /^do\s*{/ &&                                      # do {...
+                            $dstat !~ /^\({/)                                           # ({...
+                        {
+                                $ctx =~ s/\n*$//;
+                                my $herectx = $here . "\n";
+                                my $cnt = statement_rawlines($ctx);
+
+                                for (my $n = 0; $n < $cnt; $n++) {
+                                        $herectx .= raw_line($linenr, $n) . "\n";
                                 }
 
-                        } elsif ($ctx !~ /;/) {
-                                if ($dstat ne '' &&
-                                    $dstat !~ /^(?:$Ident|-?$Constant)$/ &&
-                                    $dstat !~ /$exceptions/ &&
-                                    $dstat !~ /^\.$Ident\s*=/ &&
-                                    $dstat =~ /$Operators/)
-                                {
+                                if ($dstat =~ /;/) {
+                                        ERROR("MULTISTATEMENT_MACRO_USE_DO_WHILE",
+                                              "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx");
+                                } else {
                                         ERROR("COMPLEX_MACRO",
-                                              "Macros with complex values should be enclosed in parenthesis\n" . "$here\n$ctx\n");
+                                              "Macros with complex values should be enclosed in parenthesis\n" . "$herectx");
                                 }
                         }
                 }
@@ -2931,11 +2968,11 @@ sub process {
                                 }
                         }
                         if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
-                                my $herectx = $here . "\n";;
+                                my $herectx = $here . "\n";
                                 my $cnt = statement_rawlines($block);
 
                                 for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";;
+                                        $herectx .= raw_line($linenr, $n) . "\n";
                                 }
 
                                 WARN("BRACES",
@@ -3074,6 +3111,12 @@ sub process {
                              "__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/) {
+                        WARN("PREFER_PRINTF",
+                             "__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr);
+                }
+
 # check for sizeof(&)
                 if ($line =~ /\bsizeof\s*\(\s*\&/) {
                         WARN("SIZEOF_ADDRESS",
@@ -3086,6 +3129,46 @@ sub process {
                              "Avoid line continuations in quoted strings\n" . $herecurr);
                 }
 
+# Check for misused memsets
+                if (defined $stat &&
+                    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) {
+
+                        my $ms_addr = $2;
+                        my $ms_val = $8;
+                        my $ms_size = $14;
+
+                        if ($ms_size =~ /^(0x|)0$/i) {
+                                ERROR("MEMSET",
+                                      "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$stat\n");
+                        } elsif ($ms_size =~ /^(0x|)1$/i) {
+                                WARN("MEMSET",
+                                     "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$stat\n");
+                        }
+                }
+
+# typecasts on min/max could be min_t/max_t
+                if (defined $stat &&
+                    $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
+                        if (defined $2 || defined $8) {
+                                my $call = $1;
+                                my $cast1 = deparenthesize($2);
+                                my $arg1 = $3;
+                                my $cast2 = deparenthesize($8);
+                                my $arg2 = $9;
+                                my $cast;
+
+                                if ($cast1 ne "" && $cast2 ne "") {
+                                        $cast = "$cast1 or $cast2";
+                                } elsif ($cast1 ne "") {
+                                        $cast = $cast1;
+                                } else {
+                                        $cast = $cast2;
+                                }
+                                WARN("MINMAX",
+                                     "$call() should probably be ${call}_t($cast, $arg1, $arg2)\n" . "$here\n$stat\n");
+                        }
+                }
+
 # check for new externs in .c files.
                 if ($realfile =~ /\.c$/ && defined $stat &&
                     $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
@@ -3150,10 +3233,10 @@ sub process {
                              "consider using a completion\n" . $herecurr);
 
                 }
-# recommend kstrto* over simple_strto*
-                if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
+# recommend kstrto* over simple_strto* and strict_strto*
+                if ($line =~ /\b((simple|strict)_(strto(l|ll|ul|ull)))\s*\(/) {
                         WARN("CONSIDER_KSTRTO",
-                             "consider using kstrto* in preference to simple_$1\n" . $herecurr);
+                             "$1 is obsolete, use k$3 instead\n" . $herecurr);
                 }
 # check for __initcall(), use device_initcall() explicitly please
                 if ($line =~ /^.\s*__initcall\s*\(/) {
@@ -3257,12 +3340,6 @@ sub process {
                         WARN("EXPORTED_WORLD_WRITABLE",
                              "Exporting world writable files is usually an error. Consider more restrictive permissions.\n" . $herecurr);
                 }
-
-                # Check for memset with swapped arguments
-                if ($line =~ /memset.*\,(\ |)(0x|)0(\ |0|)\);/) {
-                        ERROR("MEMSET",
-                              "memset size is 3rd argument, not the second.\n" . $herecurr);
-                }
         }
 
         # If we have no input at all, then there is nothing to report on
diff --git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
new file mode 100755
index 000000000000..5061abcc2540
--- /dev/null
+++ b/scripts/extract-vmlinux
@@ -0,0 +1,62 @@
+#!/bin/sh
+# ----------------------------------------------------------------------
+# extract-vmlinux - Extract uncompressed vmlinux from a kernel image
+#
+# Inspired from extract-ikconfig
+# (c) 2009,2010 Dick Streefland <dick@streefland.net>
+#
+# (c) 2011      Corentin Chary <corentin.chary@gmail.com>
+#
+# Licensed under the GNU General Public License, version 2 (GPLv2).
+# ----------------------------------------------------------------------
+
+check_vmlinux()
+{
+        # Use readelf to check if it's a valid ELF
+        # TODO: find a better to way to check that it's really vmlinux
+        #       and not just an elf
+        readelf -h $1 > /dev/null 2>&1 || return 1
+
+        cat $1
+        exit 0
+}
+
+try_decompress()
+{
+        # 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.
+
+        # Try to find the header ($1) and decompress from here
+        for     pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
+        do
+                pos=${pos%%:*}
+                tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
+                check_vmlinux $tmp
+        done
+}
+
+# Check invocation:
+me=${0##*/}
+img=$1
+if      [ $# -ne 1 -o ! -s "$img" ]
+then
+        echo "Usage: $me <kernel-image>" >&2
+        exit 2
+fi
+
+# Prepare temp files:
+tmp=$(mktemp /tmp/vmlinux-XXX)
+trap "rm -f $tmp" 0
+
+# Initial attempt for uncompressed images or objects:
+check_vmlinux $img
+
+# That didn't work, so retry after decompression.
+try_decompress '\037\213\010' xy    gunzip
+try_decompress '\3757zXZ\000' abcde unxz
+try_decompress 'BZh'          xy    bunzip2
+try_decompress '\135\0\0\0'   xxx   unlzma
+try_decompress '\211\114\132' xy    'lzop -d'
+
+# Bail out:
+echo "$me: Cannot find vmlinux." >&2
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index eb2f1e64edf7..f32a04c4c5bc 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -95,7 +95,7 @@ my %VCS_cmds_git = (
     "execute_cmd" => \&git_execute_cmd,
     "available" => '(which("git") ne "") && (-d ".git")',
     "find_signers_cmd" =>
-        "git log --no-color --since=\$email_git_since " .
+        "git log --no-color --follow --since=\$email_git_since " .
             '--format="GitCommit: %H%n' .
                       'GitAuthor: %an <%ae>%n' .
                       'GitDate: %aD%n' .
@@ -1389,7 +1389,7 @@ sub vcs_exists {
         warn("$P: No supported VCS found.  Add --nogit to options?\n");
         warn("Using a git repository produces better results.\n");
         warn("Try Linus Torvalds' latest git repository using:\n");
-        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n");
+        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n");
         $printed_novcs = 1;
     }
     return 0;
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 82d2eb285b70..914833d99b06 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -33,17 +33,9 @@ silentoldconfig: $(obj)/conf
         $(Q)mkdir -p include/generated
         $< --$@ $(Kconfig)
 
-# if no path is given, then use src directory to find file
-ifdef LSMOD
-LSMOD_F := $(LSMOD)
-ifeq ($(findstring /,$(LSMOD)),)
-  LSMOD_F := $(objtree)/$(LSMOD)
-endif
-endif
-
-localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         $(Q)mkdir -p include/generated
-        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
+        $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
         $(Q)if [ -f .config ]; then                                     \
                         cmp -s .tmp.config .config ||                   \
                         (mv -f .config .config.old.1;                   \
@@ -56,22 +48,6 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
         fi
         $(Q)rm -f .tmp.config
 
-localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
-        $(Q)mkdir -p include/generated
-        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-        $(Q)sed -i s/=m/=y/ .tmp.config
-        $(Q)if [ -f .config ]; then                                     \
-                        cmp -s .tmp.config .config ||                   \
-                        (mv -f .config .config.old.1;                   \
-                         mv -f .tmp.config .config;                     \
-                         $(obj)/conf --silentoldconfig $(Kconfig);      \
-                         mv -f .config.old.1 .config.old)               \
-        else                                                            \
-                        mv -f .tmp.config .config;                      \
-                        $(obj)/conf --silentoldconfig $(Kconfig);       \
-        fi
-        $(Q)rm -f .tmp.config
-
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
@@ -84,8 +60,8 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             --directory=$(srctree) --directory=$(objtree)           \
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
-        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
+        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
+            $(srctree)/arch/*/um/Kconfig`;               \
             do                                           \
                 echo "  GEN $$i";                        \
                 $(obj)/kxgettext $$i                     \
@@ -93,7 +69,6 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
             --output $(obj)/linux.pot
-        $(Q)rm -f $(srctree)/arch/um/Kconfig
         $(Q)rm -f $(obj)/config.pot
 
 PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 59b667cae5f3..5a58965d8800 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -503,17 +503,6 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
                         fprintf(fp, "#define %s%s%s 1\n",
                             CONFIG_, sym->name, suffix);
                 }
-                /*
-                 * Generate the __enabled_CONFIG_* and
-                 * __enabled_CONFIG_*_MODULE macros for use by the
-                 * IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
-                 * generated even for booleans so that the IS_ENABLED() macro
-                 * works.
-                 */
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
-                                sym->name, (*value == 'y'));
-                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
-                                sym->name, (*value == 'm'));
                 break;
         }
         case S_HEX: {
@@ -565,6 +554,35 @@ static struct conf_printer header_printer_cb =
 };
 
 /*
+ * Generate the __enabled_CONFIG_* and __enabled_CONFIG_*_MODULE macros for
+ * use by the IS_{ENABLED,BUILTIN,MODULE} macros. The _MODULE variant is
+ * generated even for booleans so that the IS_ENABLED() macro works.
+ */
+static void
+header_print__enabled_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
+{
+
+        switch (sym->type) {
+        case S_BOOLEAN:
+        case S_TRISTATE: {
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s %d\n",
+                    sym->name, (*value == 'y'));
+                fprintf(fp, "#define __enabled_" CONFIG_ "%s_MODULE %d\n",
+                    sym->name, (*value == 'm'));
+                break;
+        }
+        default:
+                break;
+        }
+}
+
+static struct conf_printer header__enabled_printer_cb =
+{
+        .print_symbol = header_print__enabled_symbol,
+        .print_comment = header_print_comment,
+};
+
+/*
  * Tristate printer
  *
  * This printer is used when generating the `include/config/tristate.conf' file.
@@ -945,11 +963,16 @@ int conf_write_autoconf(void)
         conf_write_heading(out_h, &header_printer_cb, NULL);
 
         for_all_symbols(i, sym) {
+                if (!sym->name)
+                        continue;
+
                 sym_calc_value(sym);
-                if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
+
+                conf_write_symbol(out_h, sym, &header__enabled_printer_cb, NULL);
+
+                if (!(sym->flags & SYMBOL_WRITE))
                         continue;
 
-                /* write symbol to auto.conf, tristate and header files */
                 conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
 
                 conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index c704712d0227..154c2dd245b7 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -320,7 +320,6 @@ static void print_page(WINDOW * win, int height, int width)
  */
 static void print_line(WINDOW * win, int row, int width)
 {
-        int y, x;
         char *line;
 
         line = get_line();
@@ -329,10 +328,10 @@ static void print_line(WINDOW * win, int row, int width)
         waddch(win, ' ');
         waddnstr(win, line, MIN(strlen(line), width - 2));
 
-        getyx(win, y, x);
         /* Clear 'residue' of previous line */
 #if OLD_NCURSES
         {
+                int x = getcurx(win);
                 int i;
                 for (i = 0; i < width - x; i++)
                         waddch(win, ' ');
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 820d2b6800fb..19e200d91120 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -15,6 +15,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 #include <locale.h>
 
@@ -272,6 +273,7 @@ static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
 static int show_all_options;
+static int saved_x, saved_y;
 
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
@@ -792,9 +794,54 @@ static void conf_save(void)
         }
 }
 
+static int handle_exit(void)
+{
+        int res;
+
+        dialog_clear();
+        if (conf_get_changed())
+                res = dialog_yesno(NULL,
+                                   _("Do you wish to save your new configuration ?\n"
+                                     "<ESC><ESC> to continue."),
+                                   6, 60);
+        else
+                res = -1;
+
+        end_dialog(saved_x, saved_y);
+
+        switch (res) {
+        case 0:
+                if (conf_write(filename)) {
+                        fprintf(stderr, _("\n\n"
+                                          "Error while writing of the configuration.\n"
+                                          "Your configuration changes were NOT saved."
+                                          "\n\n"));
+                        return 1;
+                }
+                /* fall through */
+        case -1:
+                printf(_("\n\n"
+                         "*** End of the configuration.\n"
+                         "*** Execute 'make' to start the build or try 'make help'."
+                         "\n\n"));
+                res = 0;
+                break;
+        default:
+                fprintf(stderr, _("\n\n"
+                                  "Your configuration changes were NOT saved."
+                                  "\n\n"));
+        }
+
+        return res;
+}
+
+static void sig_handler(int signo)
+{
+        exit(handle_exit());
+}
+
 int main(int ac, char **av)
 {
-        int saved_x, saved_y;
         char *mode;
         int res;
 
@@ -802,6 +849,8 @@ int main(int ac, char **av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
+        signal(SIGINT, sig_handler);
+
         conf_parse(av[1]);
         conf_read(NULL);
 
@@ -823,40 +872,9 @@ int main(int ac, char **av)
         set_config_filename(conf_get_configname());
         do {
                 conf(&rootmenu);
-                dialog_clear();
-                if (conf_get_changed())
-                        res = dialog_yesno(NULL,
-                                           _("Do you wish to save your "
-                                             "new configuration?\n"
-                                             "<ESC><ESC> to continue."),
-                                           6, 60);
-                else
-                        res = -1;
+                res = handle_exit();
         } while (res == KEY_ESC);
-        end_dialog(saved_x, saved_y);
-
-        switch (res) {
-        case 0:
-                if (conf_write(filename)) {
-                        fprintf(stderr, _("\n\n"
-                                "Error while writing of the configuration.\n"
-                                "Your configuration changes were NOT saved."
-                                "\n\n"));
-                        return 1;
-                }
-                /* fall through */
-        case -1:
-                printf(_("\n\n"
-                        "*** End of the configuration.\n"
-                        "*** Execute 'make' to start the build or try 'make help'."
-                        "\n\n"));
-                break;
-        default:
-                fprintf(stderr, _("\n\n"
-                        "Your configuration changes were NOT saved."
-                        "\n\n"));
-        }
 
-        return 0;
+        return res;
 }
 
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index d66008639a43..8c2a97e60faf 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,8 +10,7 @@
 
 #include "lkc.h"
 
-static const char nohelp_text[] = N_(
-        "There is no help available for this option.\n");
+static const char nohelp_text[] = "There is no help available for this option.";
 
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -595,16 +594,14 @@ struct gstr get_relations_str(struct symbol **sym_arr)
 void menu_get_ext_help(struct menu *menu, struct gstr *help)
 {
         struct symbol *sym = menu->sym;
+        const char *help_text = nohelp_text;
 
         if (menu_has_help(menu)) {
-                if (sym->name) {
+                if (sym->name)
                         str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
-                        str_append(help, _(menu_get_help(menu)));
-                        str_append(help, "\n");
-                }
-        } else {
-                str_append(help, nohelp_text);
+                help_text = menu_get_help(menu);
         }
+        str_printf(help, "%s\n", _(help_text));
         if (sym)
                 get_symbol_str(help, sym);
 }
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 39ca1f1640ea..73070cb0b6de 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -182,8 +182,6 @@ setmod_text[] = N_(
 "This feature depends on another which\n"
 "has been configured as a module.\n"
 "As a result, this feature will be built as a module."),
-nohelp_text[] = N_(
-"There is no help available for this option.\n"),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
 "Accept the name shown to restore the configuration you\n"
@@ -280,6 +278,9 @@ static int global_exit;
 /* the currently selected button */
 const char *current_instructions = menu_instructions;
 
+static char *dialog_input_result;
+static int dialog_input_result_len;
+
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
@@ -695,7 +696,6 @@ static void search_conf(void)
 {
         struct symbol **sym_arr;
         struct gstr res;
-        char dialog_input_result[100];
         char *dialog_input;
         int dres;
 again:
@@ -703,7 +703,7 @@ again:
                         _("Search Configuration Parameter"),
                         _("Enter " CONFIG_ " (sub)string to search for "
                                 "(with or without \"" CONFIG_ "\")"),
-                        "", dialog_input_result, 99);
+                        "", &dialog_input_result, &dialog_input_result_len);
         switch (dres) {
         case 0:
                 break;
@@ -1348,7 +1348,6 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
-        char dialog_input_result[256];
 
         while (1) {
                 int res;
@@ -1371,8 +1370,8 @@ static void conf_string(struct menu *menu)
                                 prompt ? _(prompt) : _("Main Menu"),
                                 heading,
                                 sym_get_string_value(menu->sym),
-                                dialog_input_result,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (sym_set_string_value(menu->sym,
@@ -1392,14 +1391,13 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
-        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, load_config_text,
                                 filename,
-                                dialog_input_result,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
@@ -1424,14 +1422,13 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
-        char dialog_input_result[256];
         while (1) {
                 int res;
                 res = dialog_inputbox(main_window,
                                 NULL, save_config_text,
                                 filename,
-                                dialog_input_result,
-                                sizeof(dialog_input_result));
+                                &dialog_input_result,
+                                &dialog_input_result_len);
                 switch (res) {
                 case 0:
                         if (!dialog_input_result[0])
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index f8137b3a5382..3b18dd839668 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -356,7 +356,7 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
 
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char *result, int result_len)
+                const char *init, char **resultp, int *result_len)
 {
         int prompt_lines = 0;
         int prompt_width = 0;
@@ -367,7 +367,13 @@ int dialog_inputbox(WINDOW *main_window,
         int i, x, y;
         int res = -1;
         int cursor_position = strlen(init);
+        int cursor_form_win;
+        char *result = *resultp;
 
+        if (strlen(init)+1 > *result_len) {
+                *result_len = strlen(init)+1;
+                *resultp = result = realloc(result, *result_len);
+        }
 
         /* find the widest line of msg: */
         prompt_lines = get_line_no(prompt);
@@ -384,7 +390,7 @@ int dialog_inputbox(WINDOW *main_window,
         y = (LINES-(prompt_lines+4))/2;
         x = (COLS-(prompt_width+4))/2;
 
-        strncpy(result, init, result_len);
+        strncpy(result, init, *result_len);
 
         /* create the windows */
         win = newwin(prompt_lines+6, prompt_width+7, y, x);
@@ -405,7 +411,9 @@ int dialog_inputbox(WINDOW *main_window,
         fill_window(prompt_win, prompt);
 
         mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-        mvwprintw(form_win, 0, 0, "%s", result);
+        cursor_form_win = min(cursor_position, prompt_width-1);
+        mvwprintw(form_win, 0, 0, "%s",
+                  result + cursor_position-cursor_form_win);
 
         /* create panels */
         panel = new_panel(win);
@@ -431,6 +439,8 @@ int dialog_inputbox(WINDOW *main_window,
                                                 &result[cursor_position],
                                                 len-cursor_position+1);
                                 cursor_position--;
+                                cursor_form_win--;
+                                len--;
                         }
                         break;
                 case KEY_DC:
@@ -438,38 +448,63 @@ int dialog_inputbox(WINDOW *main_window,
                                 memmove(&result[cursor_position],
                                                 &result[cursor_position+1],
                                                 len-cursor_position+1);
+                                len--;
                         }
                         break;
                 case KEY_UP:
                 case KEY_RIGHT:
-                        if (cursor_position < len &&
-                            cursor_position < min(result_len, prompt_width))
+                        if (cursor_position < len) {
                                 cursor_position++;
+                                cursor_form_win++;
+                        }
                         break;
                 case KEY_DOWN:
                 case KEY_LEFT:
-                        if (cursor_position > 0)
+                        if (cursor_position > 0) {
                                 cursor_position--;
+                                cursor_form_win--;
+                        }
+                        break;
+                case KEY_HOME:
+                        cursor_position = 0;
+                        cursor_form_win = 0;
+                        break;
+                case KEY_END:
+                        cursor_position = len;
+                        cursor_form_win = min(cursor_position, prompt_width-1);
                         break;
                 default:
-                        if ((isgraph(res) || isspace(res)) &&
-                                        len-2 < result_len) {
+                        if ((isgraph(res) || isspace(res))) {
+                                /* one for new char, one for '\0' */
+                                if (len+2 > *result_len) {
+                                        *result_len = len+2;
+                                        *resultp = result = realloc(result,
+                                                                *result_len);
+                                }
                                 /* insert the char at the proper position */
                                 memmove(&result[cursor_position+1],
                                                 &result[cursor_position],
-                                                len+1);
+                                                len-cursor_position+1);
                                 result[cursor_position] = res;
                                 cursor_position++;
+                                cursor_form_win++;
+                                len++;
                         } else {
-                                mvprintw(0, 0, "unknow key: %d\n", res);
+                                mvprintw(0, 0, "unknown key: %d\n", res);
                         }
                         break;
                 }
+                if (cursor_form_win < 0)
+                        cursor_form_win = 0;
+                else if (cursor_form_win > prompt_width-1)
+                        cursor_form_win = prompt_width-1;
+
                 wmove(form_win, 0, 0);
                 wclrtoeol(form_win);
                 mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
-                mvwprintw(form_win, 0, 0, "%s", result);
-                wmove(form_win, 0, cursor_position);
+                mvwprintw(form_win, 0, 0, "%s",
+                        result + cursor_position-cursor_form_win);
+                wmove(form_win, 0, cursor_form_win);
                 touchwin(win);
                 refresh_all_windows(main_window);
 
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
index 58fbda8fc0dc..0d5261705ef5 100644
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
@@ -89,7 +89,7 @@ void fill_window(WINDOW *win, const char *text);
 int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...);
 int dialog_inputbox(WINDOW *main_window,
                 const char *title, const char *prompt,
-                const char *init, char *result, int result_len);
+                const char *init, char **resultp, int *result_len);
 void refresh_all_windows(WINDOW *main_window);
 void show_scroll_win(WINDOW *main_window,
                 const char *title,
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index a4fe923c0131..bccf07ddd0b6 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -43,6 +43,7 @@
 #    make oldconfig
 #
 use strict;
+use Getopt::Long;
 
 my $config = ".config";
 
@@ -112,10 +113,17 @@ sub find_config {
 
 find_config;
 
+# Parse options
+my $localmodconfig = 0;
+my $localyesconfig = 0;
+
+GetOptions("localmodconfig" => \$localmodconfig,
+           "localyesconfig" => \$localyesconfig);
+
 # Get the build source and top level Kconfig file (passed in)
 my $ksource = $ARGV[0];
 my $kconfig = $ARGV[1];
-my $lsmod_file = $ARGV[2];
+my $lsmod_file = $ENV{'LSMOD'};
 
 my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
 chomp @makefiles;
@@ -242,33 +250,61 @@ if ($kconfig) {
     read_kconfig($kconfig);
 }
 
+sub convert_vars {
+    my ($line, %vars) = @_;
+
+    my $process = "";
+
+    while ($line =~ s/^(.*?)(\$\((.*?)\))//) {
+        my $start = $1;
+        my $variable = $2;
+        my $var = $3;
+
+        if (defined($vars{$var})) {
+            $process .= $start . $vars{$var};
+        } else {
+            $process .= $start . $variable;
+        }
+    }
+
+    $process .= $line;
+
+    return $process;
+}
+
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
 
-    my $cont = 0;
+    my $line = "";
+    my %make_vars;
 
     open(MIN,$makefile) || die "Can't open $makefile";
     while (<MIN>) {
+        # if this line ends with a backslash, continue
+        chomp;
+        if (/^(.*)\\$/) {
+            $line .= $1;
+            next;
+        }
+
+        $line .= $_;
+        $_ = $line;
+        $line = "";
+
         my $objs;
 
-        # is this a line after a line with a backslash?
-        if ($cont && /(\S.*)$/) {
-            $objs = $1;
-        }
-        $cont = 0;
+        $_ = convert_vars($_, %make_vars);
 
         # collect objects after obj-$(CONFIG_FOO_BAR)
         if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
             $var = $1;
             $objs = $2;
+
+        # check if variables are set
+        } elsif (/^\s*(\S+)\s*[:]?=\s*(.*\S)/) {
+            $make_vars{$1} = $2;
         }
         if (defined($objs)) {
-            # test if the line ends with a backslash
-            if ($objs =~ m,(.*)\\$,) {
-                $objs = $1;
-                $cont = 1;
-            }
-
             foreach my $obj (split /\s+/,$objs) {
                 $obj =~ s/-/_/g;
                 if ($obj =~ /(.*)\.o$/) {
@@ -296,7 +332,11 @@ my %modules;
 
 if (defined($lsmod_file)) {
     if ( ! -f $lsmod_file) {
-        die "$lsmod_file not found";
+        if ( -f $ENV{'objtree'}."/".$lsmod_file) {
+            $lsmod_file = $ENV{'objtree'}."/".$lsmod_file;
+        } else {
+                die "$lsmod_file not found";
+        }
     }
     if ( -x $lsmod_file) {
         # the file is executable, run it
@@ -421,7 +461,11 @@ while(<CIN>) {
 
     if (/^(CONFIG.*)=(m|y)/) {
         if (defined($configs{$1})) {
-            $setconfigs{$1} = $2;
+            if ($localyesconfig) {
+                $setconfigs{$1} = 'y';
+            } else {
+                $setconfigs{$1} = $2;
+            }
         } elsif ($2 eq "m") {
             print "# $1 is not set\n";
             next;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e26e2fb462d4..c0e14b3f2306 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -28,6 +28,7 @@ typedef Elf64_Addr	kernel_ulong_t;
 #endif
 
 #include <ctype.h>
+#include <stdbool.h>
 
 typedef uint32_t        __u32;
 typedef uint16_t        __u16;
@@ -38,6 +39,35 @@ typedef unsigned char	__u8;
  * we handle those differences explicitly below */
 #include "../../include/linux/mod_devicetable.h"
 
+/* This array collects all instances that use the generic do_table */
+struct devtable {
+        const char *device_id; /* name of table, __mod_<name>_device_table. */
+        unsigned long id_size;
+        void *function;
+};
+
+/* We construct a table of pointers in an ELF section (pointers generally
+ * go unpadded by gcc).  ld creates boundary syms for us. */
+extern struct devtable *__start___devtable[], *__stop___devtable[];
+#define ___cat(a,b) a ## b
+#define __cat(a,b) ___cat(a,b)
+
+#if __GNUC__ == 3 && __GNUC_MINOR__ < 3
+# define __used                 __attribute__((__unused__))
+#else
+# define __used                 __attribute__((__used__))
+#endif
+
+/* Add a table entry.  We test function type matches while we're here. */
+#define ADD_TO_DEVTABLE(device_id, type, function) \
+        static struct devtable __cat(devtable,__LINE__) = {     \
+                device_id + 0*sizeof((function)((const char *)NULL,     \
+                                                (type *)NULL,           \
+                                                (char *)NULL)),         \
+                sizeof(type), (function) };                             \
+        static struct devtable *__attribute__((section("__devtable"))) \
+                __used __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
+
 #define ADD(str, sep, cond, field)                              \
 do {                                                            \
         strcat(str, sep);                                       \
@@ -289,6 +319,7 @@ static int do_hid_entry(const char *filename,
 
         return 1;
 }
+ADD_TO_DEVTABLE("hid", struct hid_device_id, do_hid_entry);
 
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
@@ -313,6 +344,7 @@ static int do_ieee1394_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ieee1394", struct ieee1394_device_id, do_ieee1394_entry);
 
 /* Looks like: pci:vNdNsvNsdNbcNscNiN. */
 static int do_pci_entry(const char *filename,
@@ -356,6 +388,7 @@ static int do_pci_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("pci", struct pci_device_id, do_pci_entry);
 
 /* looks like: "ccw:tNmNdtNdmN" */
 static int do_ccw_entry(const char *filename,
@@ -379,6 +412,7 @@ static int do_ccw_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ccw", struct ccw_device_id, do_ccw_entry);
 
 /* looks like: "ap:tN" */
 static int do_ap_entry(const char *filename,
@@ -387,6 +421,7 @@ static int do_ap_entry(const char *filename,
         sprintf(alias, "ap:t%02X*", id->dev_type);
         return 1;
 }
+ADD_TO_DEVTABLE("ap", struct ap_device_id, do_ap_entry);
 
 /* looks like: "css:tN" */
 static int do_css_entry(const char *filename,
@@ -395,6 +430,7 @@ static int do_css_entry(const char *filename,
         sprintf(alias, "css:t%01X", id->type);
         return 1;
 }
+ADD_TO_DEVTABLE("css", struct css_device_id, do_css_entry);
 
 /* Looks like: "serio:tyNprNidNexN" */
 static int do_serio_entry(const char *filename,
@@ -414,6 +450,7 @@ static int do_serio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("serio", struct serio_device_id, do_serio_entry);
 
 /* looks like: "acpi:ACPI0003 or acpi:PNP0C0B" or "acpi:LNXVIDEO" */
 static int do_acpi_entry(const char *filename,
@@ -422,6 +459,7 @@ static int do_acpi_entry(const char *filename,
         sprintf(alias, "acpi*:%s:*", id->id);
         return 1;
 }
+ADD_TO_DEVTABLE("acpi", struct acpi_device_id, do_acpi_entry);
 
 /* looks like: "pnp:dD" */
 static void do_pnp_device_entry(void *symval, unsigned long size,
@@ -544,8 +582,7 @@ static int do_pcmcia_entry(const char *filename,
         add_wildcard(alias);
        return 1;
 }
-
-
+ADD_TO_DEVTABLE("pcmcia", struct pcmcia_device_id, do_pcmcia_entry);
 
 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
 {
@@ -568,6 +605,7 @@ static int do_of_entry (const char *filename, struct of_device_id *of, char *ali
     add_wildcard(alias);
     return 1;
 }
+ADD_TO_DEVTABLE("of", struct of_device_id, do_of_entry);
 
 static int do_vio_entry(const char *filename, struct vio_device_id *vio,
                 char *alias)
@@ -585,6 +623,7 @@ static int do_vio_entry(const char *filename, struct vio_device_id *vio,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("vio", struct vio_device_id, do_vio_entry);
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -640,6 +679,7 @@ static int do_input_entry(const char *filename, struct input_device_id *id,
                 do_input(alias, id->swbit, 0, INPUT_DEVICE_ID_SW_MAX);
         return 1;
 }
+ADD_TO_DEVTABLE("input", struct input_device_id, do_input_entry);
 
 static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 char *alias)
@@ -650,6 +690,7 @@ static int do_eisa_entry(const char *filename, struct eisa_device_id *eisa,
                 strcat(alias, "*");
         return 1;
 }
+ADD_TO_DEVTABLE("eisa", struct eisa_device_id, do_eisa_entry);
 
 /* Looks like: parisc:tNhvNrevNsvN */
 static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
@@ -669,6 +710,7 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("parisc", struct parisc_device_id, do_parisc_entry);
 
 /* Looks like: sdio:cNvNdN. */
 static int do_sdio_entry(const char *filename,
@@ -685,6 +727,7 @@ static int do_sdio_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("sdio", struct sdio_device_id, do_sdio_entry);
 
 /* Looks like: ssb:vNidNrevN. */
 static int do_ssb_entry(const char *filename,
@@ -701,6 +744,7 @@ static int do_ssb_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("ssb", struct ssb_device_id, do_ssb_entry);
 
 /* Looks like: bcma:mNidNrevNclN. */
 static int do_bcma_entry(const char *filename,
@@ -719,6 +763,7 @@ static int do_bcma_entry(const char *filename,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("bcma", struct bcma_device_id, do_bcma_entry);
 
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
@@ -734,6 +779,29 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
         add_wildcard(alias);
         return 1;
 }
+ADD_TO_DEVTABLE("virtio", struct virtio_device_id, do_virtio_entry);
+
+/*
+ * Looks like: vmbus:guid
+ * Each byte of the guid will be represented by two hex characters
+ * in the name.
+ */
+
+static int do_vmbus_entry(const char *filename, struct hv_vmbus_device_id *id,
+                          char *alias)
+{
+        int i;
+        char guid_name[((sizeof(id->guid) + 1)) * 2];
+
+        for (i = 0; i < (sizeof(id->guid) * 2); i += 2)
+                sprintf(&guid_name[i], "%02x", id->guid[i/2]);
+
+        strcpy(alias, "vmbus:");
+        strcat(alias, guid_name);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("vmbus", struct hv_vmbus_device_id, do_vmbus_entry);
 
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
@@ -743,6 +811,7 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
 
         return 1;
 }
+ADD_TO_DEVTABLE("i2c", struct i2c_device_id, do_i2c_entry);
 
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, struct spi_device_id *id,
@@ -752,6 +821,17 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
 
         return 1;
 }
+ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
+
+/* Looks like: mcp:S */
+static int do_mcp_entry(const char *filename, struct mcp_device_id *id,
+                        char *alias)
+{
+        sprintf(alias, MCP_MODULE_PREFIX "%s", id->name);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("mcp", struct mcp_device_id, do_mcp_entry); 
 
 static const struct dmifield {
         const char *prefix;
@@ -806,6 +886,7 @@ static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
         strcat(alias, ":");
         return 1;
 }
+ADD_TO_DEVTABLE("dmi", struct dmi_system_id, do_dmi_entry);
 
 static int do_platform_entry(const char *filename,
                              struct platform_device_id *id, char *alias)
@@ -813,6 +894,7 @@ static int do_platform_entry(const char *filename,
         sprintf(alias, PLATFORM_MODULE_PREFIX "%s", id->name);
         return 1;
 }
+ADD_TO_DEVTABLE("platform", struct platform_device_id, do_platform_entry);
 
 static int do_mdio_entry(const char *filename,
                          struct mdio_device_id *id, char *alias)
@@ -835,6 +917,7 @@ static int do_mdio_entry(const char *filename,
 
         return 1;
 }
+ADD_TO_DEVTABLE("mdio", struct mdio_device_id, do_mdio_entry);
 
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
@@ -845,6 +928,7 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
         ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
         return 1;
 }
+ADD_TO_DEVTABLE("zorro", struct zorro_device_id, do_zorro_entry);
 
 /* looks like: "pnp:dD" */
 static int do_isapnp_entry(const char *filename,
@@ -858,16 +942,84 @@ static int do_isapnp_entry(const char *filename,
                 (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
         return 1;
 }
+ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry);
+
+/*
+ * Append a match expression for a single masked hex digit.
+ * outp points to a pointer to the character at which to append.
+ *      *outp is updated on return to point just after the appended text,
+ *      to facilitate further appending.
+ */
+static void append_nibble_mask(char **outp,
+                               unsigned int nibble, unsigned int mask)
+{
+        char *p = *outp;
+        unsigned int i;
+
+        switch (mask) {
+        case 0:
+                *p++ = '?';
+                break;
+
+        case 0xf:
+                p += sprintf(p, "%X",  nibble);
+                break;
+
+        default:
+                /*
+                 * Dumbly emit a match pattern for all possible matching
+                 * digits.  This could be improved in some cases using ranges,
+                 * but it has the advantage of being trivially correct, and is
+                 * often optimal.
+                 */
+                *p++ = '[';
+                for (i = 0; i < 0x10; i++)
+                        if ((i & mask) == nibble)
+                                p += sprintf(p, "%X", i);
+                *p++ = ']';
+        }
+
+        /* Ensure that the string remains NUL-terminated: */
+        *p = '\0';
+
+        /* Advance the caller's end-of-string pointer: */
+        *outp = p;
+}
+
+/*
+ * looks like: "amba:dN"
+ *
+ * N is exactly 8 digits, where each is an upper-case hex digit, or
+ *      a ? or [] pattern matching exactly one digit.
+ */
+static int do_amba_entry(const char *filename,
+                         struct amba_id *id, char *alias)
+{
+        unsigned int digit;
+        char *p = alias;
+
+        if ((id->id & id->mask) != id->id)
+                fatal("%s: Masked-off bit(s) of AMBA device ID are non-zero: "
+                      "id=0x%08X, mask=0x%08X.  Please fix this driver.\n",
+                      filename, id->id, id->mask);
+
+        p += sprintf(alias, "amba:d");
+        for (digit = 0; digit < 8; digit++)
+                append_nibble_mask(&p,
+                                   (id->id >> (4 * (7 - digit))) & 0xf,
+                                   (id->mask >> (4 * (7 - digit))) & 0xf);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("amba", struct amba_id, do_amba_entry);
 
-/* Ignore any prefix, eg. some architectures prepend _ */
-static inline int sym_is(const char *symbol, const char *name)
+/* Does namelen bytes of name exactly match the symbol? */
+static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
-        const char *match;
+        if (namelen != strlen(symbol))
+                return false;
 
-        match = strstr(symbol, name);
-        if (!match)
-                return 0;
-        return match[strlen(name)] == '\0';
+        return memcmp(name, symbol, namelen) == 0;
 }
 
 static void do_table(void *symval, unsigned long size,
@@ -900,11 +1052,25 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
 {
         void *symval;
         char *zeros = NULL;
+        const char *name;
+        unsigned int namelen;
 
         /* We're looking for a section relative symbol */
         if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
+        /* All our symbols are of form <prefix>__mod_XXX_device_table. */
+        name = strstr(symname, "__mod_");
+        if (!name)
+                return;
+        name += strlen("__mod_");
+        namelen = strlen(name);
+        if (namelen < strlen("_device_table"))
+                return;
+        if (strcmp(name + namelen - strlen("_device_table"), "_device_table"))
+                return;
+        namelen -= strlen("_device_table");
+
         /* Handle all-NULL symbols allocated into .bss */
         if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                 zeros = calloc(1, sym->st_size);
@@ -915,113 +1081,24 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                         + sym->st_value;
         }
 
-        if (sym_is(symname, "__mod_pci_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pci_device_id), "pci",
-                         do_pci_entry, mod);
-        else if (sym_is(symname, "__mod_usb_device_table"))
-                /* special case to handle bcdDevice ranges */
+        /* First handle the "special" cases */
+        if (sym_is(name, namelen, "usb"))
                 do_usb_table(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_hid_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct hid_device_id), "hid",
-                         do_hid_entry, mod);
-        else if (sym_is(symname, "__mod_ieee1394_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ieee1394_device_id), "ieee1394",
-                         do_ieee1394_entry, mod);
-        else if (sym_is(symname, "__mod_ccw_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ccw_device_id), "ccw",
-                         do_ccw_entry, mod);
-        else if (sym_is(symname, "__mod_ap_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ap_device_id), "ap",
-                         do_ap_entry, mod);
-        else if (sym_is(symname, "__mod_css_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct css_device_id), "css",
-                         do_css_entry, mod);
-        else if (sym_is(symname, "__mod_serio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct serio_device_id), "serio",
-                         do_serio_entry, mod);
-        else if (sym_is(symname, "__mod_acpi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct acpi_device_id), "acpi",
-                         do_acpi_entry, mod);
-        else if (sym_is(symname, "__mod_pnp_device_table"))
+        else if (sym_is(name, namelen, "pnp"))
                 do_pnp_device_entry(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_pnp_card_device_table"))
+        else if (sym_is(name, namelen, "pnp_card"))
                 do_pnp_card_entries(symval, sym->st_size, mod);
-        else if (sym_is(symname, "__mod_pcmcia_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct pcmcia_device_id), "pcmcia",
-                         do_pcmcia_entry, mod);
-        else if (sym_is(symname, "__mod_of_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct of_device_id), "of",
-                         do_of_entry, mod);
-        else if (sym_is(symname, "__mod_vio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct vio_device_id), "vio",
-                         do_vio_entry, mod);
-        else if (sym_is(symname, "__mod_input_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct input_device_id), "input",
-                         do_input_entry, mod);
-        else if (sym_is(symname, "__mod_eisa_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct eisa_device_id), "eisa",
-                         do_eisa_entry, mod);
-        else if (sym_is(symname, "__mod_parisc_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct parisc_device_id), "parisc",
-                         do_parisc_entry, mod);
-        else if (sym_is(symname, "__mod_sdio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct sdio_device_id), "sdio",
-                         do_sdio_entry, mod);
-        else if (sym_is(symname, "__mod_ssb_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct ssb_device_id), "ssb",
-                         do_ssb_entry, mod);
-        else if (sym_is(symname, "__mod_bcma_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct bcma_device_id), "bcma",
-                         do_bcma_entry, mod);
-        else if (sym_is(symname, "__mod_virtio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct virtio_device_id), "virtio",
-                         do_virtio_entry, mod);
-        else if (sym_is(symname, "__mod_i2c_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct i2c_device_id), "i2c",
-                         do_i2c_entry, mod);
-        else if (sym_is(symname, "__mod_spi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct spi_device_id), "spi",
-                         do_spi_entry, mod);
-        else if (sym_is(symname, "__mod_dmi_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct dmi_system_id), "dmi",
-                         do_dmi_entry, mod);
-        else if (sym_is(symname, "__mod_platform_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct platform_device_id), "platform",
-                         do_platform_entry, mod);
-        else if (sym_is(symname, "__mod_mdio_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct mdio_device_id), "mdio",
-                         do_mdio_entry, mod);
-        else if (sym_is(symname, "__mod_zorro_device_table"))
-                do_table(symval, sym->st_size,
-                         sizeof(struct zorro_device_id), "zorro",
-                         do_zorro_entry, mod);
-        else if (sym_is(symname, "__mod_isapnp_device_table"))
-                do_table(symval, sym->st_size,
-                        sizeof(struct isapnp_device_id), "isa",
-                        do_isapnp_entry, mod);
+        else {
+                struct devtable **p;
+
+                for (p = __start___devtable; p < __stop___devtable; p++) {
+                        if (sym_is(name, namelen, (*p)->device_id)) {
+                                do_table(symval, sym->st_size, (*p)->id_size,
+                                         (*p)->device_id, (*p)->function, mod);
+                                break;
+                        }
+                }
+        }
         free(zeros);
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index a509ff8f32fa..2bd594e6d1b4 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1849,6 +1849,12 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "};\n");
 }
 
+static void add_intree_flag(struct buffer *b, int is_intree)
+{
+        if (is_intree)
+                buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
+}
+
 static void add_staging_flag(struct buffer *b, const char *name)
 {
         static const char *staging_dir = "drivers/staging";
@@ -2169,6 +2175,7 @@ int main(int argc, char **argv)
                 buf.pos = 0;
 
                 add_header(&buf, mod);
+                add_intree_flag(&buf, !external_module);
                 add_staging_flag(&buf, mod->name);
                 err |= add_versions(&buf, mod);
                 add_depends(&buf, mod, modules);
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index bc6aa003860e..87bf08076b11 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -141,7 +141,7 @@ perf-%pkg: FORCE
 help: FORCE
         @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
         @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg             - Build the kernel as an deb package'
+        @echo '  deb-pkg             - Build the kernel as a deb package'
         @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
         @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
         @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index f40a6af6bf40..54e35c1e5948 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -462,7 +462,7 @@ __has_rel_mcount(Elf_Shdr const *const relhdr,  /* is SHT_REL or SHT_RELA */
                 succeed_file();
         }
         if (w(txthdr->sh_type) != SHT_PROGBITS ||
-            !(w(txthdr->sh_flags) & SHF_EXECINSTR))
+            !(_w(txthdr->sh_flags) & SHF_EXECINSTR))
                 return NULL;
         return txtname;
 }
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 75c5d24f1993..38f6617a2cb1 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -129,7 +129,7 @@ exuberant()
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
         -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
         --extra=+f --c-kinds=+px                                \
-        --regex-asm='/^ENTRY\(([^)]*)\).*/\1/'                  \
+        --regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \
         --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
         --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
         --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'
@@ -151,7 +151,7 @@ exuberant()
 emacs()
 {
         all_sources | xargs $1 -a                               \
-        --regex='/^ENTRY(\([^)]*\)).*/\1/'                      \
+        --regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/'            \
         --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
         --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
         --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/'