History

Merge branch 'percpu-for-linus' into percpu-for-next

Conflicts: arch/sparc/kernel/smp_64.c arch/x86/kernel/cpu/perf_counter.c arch/x86/kernel/setup_percpu.c drivers/cpufreq/cpufreq_ondemand.c mm/percpu.c Conflicts in core and arch percpu codes are mostly from commit ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all the first chunk allocators into mm/percpu.c, the changes are moved from arch code to mm/percpu.c.

Tejun Heo committed 17 years ago

Commit 384be2b2 parents a76761b 142d44b1985 files · +49305 −28005Browse files

Showing the changes to scripts (7 of 1985 files). Show all

Unified · Split

7 files
  1. scripts/.gitignore +1 −0
  2. scripts/get_maintainer.pl +35 −7
  3. scripts/kconfig/lxdialog/util.c +2 −0
  4. scripts/kconfig/mconf.c +2 −0
  5. scripts/markup_oops.pl +3 −2
  6. scripts/package/builddeb +3 −1
  7. scripts/recordmcount.pl +8 −4
scripts/.gitignore+1−0
@@ -7,3 +7,4 @@ pnmtologo · 6 unmodified lines
7bin2c7bin2c
8unifdef8unifdef
9binoffset9binoffset
10ihex2fw
scripts/get_maintainer.pl+35−7
@@ -13,7 +13,7 @@ · 12 unmodified lines
13use strict;13use strict;
14 14
15my $P = $0;15my $P = $0;
16my $V = '0.16';16my $V = '0.17';
17 17
18use Getopt::Long qw(:config no_auto_abbrev);18use Getopt::Long qw(:config no_auto_abbrev);
19 19
@@ -27,6 +27,7 @@ my $email_git = 1; · 7 unmodified lines
27my $email_git_penguin_chiefs = 0;27my $email_git_penguin_chiefs = 0;
28my $email_git_min_signatures = 1;28my $email_git_min_signatures = 1;
29my $email_git_max_maintainers = 5;29my $email_git_max_maintainers = 5;
30my $email_git_min_percent = 5;
30my $email_git_since = "1-year-ago";31my $email_git_since = "1-year-ago";
31my $output_multiline = 1;32my $output_multiline = 1;
32my $output_separator = ", ";33my $output_separator = ", ";
@@ -65,6 +66,7 @@ if (!GetOptions( · 32 unmodified lines
65 'git-chief-penguins!' => \$email_git_penguin_chiefs,66 'git-chief-penguins!' => \$email_git_penguin_chiefs,
66 'git-min-signatures=i' => \$email_git_min_signatures,67 'git-min-signatures=i' => \$email_git_min_signatures,
67 'git-max-maintainers=i' => \$email_git_max_maintainers,68 'git-max-maintainers=i' => \$email_git_max_maintainers,
69 'git-min-percent=i' => \$email_git_min_percent,
68 'git-since=s' => \$email_git_since,70 'git-since=s' => \$email_git_since,
69 'm!' => \$email_maintainer,71 'm!' => \$email_maintainer,
70 'n!' => \$email_usename,72 'n!' => \$email_usename,
@@ -132,6 +134,10 @@ while (<MAINT>) { · 61 unmodified lines
132 $value =~ s@\.@\\\.@g; ##Convert . to \.134 $value =~ s@\.@\\\.@g; ##Convert . to \.
133 $value =~ s/\*/\.\*/g; ##Convert * to .*135 $value =~ s/\*/\.\*/g; ##Convert * to .*
134 $value =~ s/\?/\./g; ##Convert ? to .136 $value =~ s/\?/\./g; ##Convert ? to .
137 ##if pattern is a directory and it lacks a trailing slash, add one
138 if ((-d $value)) {
139 $value =~ s@([^/])$@$1/@;
140 }
135 }141 }
136 push(@typevalue, "$type:$value");142 push(@typevalue, "$type:$value");
137 } elsif (!/^(\s)*$/) {143 } elsif (!/^(\s)*$/) {
@@ -146,8 +152,10 @@ close(MAINT); · 8 unmodified lines
146my @files = ();152my @files = ();
147 153
148foreach my $file (@ARGV) {154foreach my $file (@ARGV) {
149 next if ((-d $file));155 ##if $file is a directory and it lacks a trailing slash, add one
150 if (!(-f $file)) {156 if ((-d $file)) {
157 $file =~ s@([^/])$@$1/@;
158 } elsif (!(-f $file)) {
151 die "$P: file '${file}' not found\n";159 die "$P: file '${file}' not found\n";
152 }160 }
153 if ($from_filename) {161 if ($from_filename) {
@@ -292,7 +300,7 @@ sub file_match_pattern { · 138 unmodified lines
292sub usage {300sub usage {
293 print <<EOT;301 print <<EOT;
294usage: $P [options] patchfile302usage: $P [options] patchfile
295 $P [options] -f file303 $P [options] -f file|directory
296version: $V304version: $V
297 305
298MAINTAINER field selection options:306MAINTAINER field selection options:
@@ -301,6 +309,7 @@ MAINTAINER field selection options: · 2 unmodified lines
301 --git-chief-penguins => include ${penguin_chiefs}309 --git-chief-penguins => include ${penguin_chiefs}
302 --git-min-signatures => number of signatures required (default: 1)310 --git-min-signatures => number of signatures required (default: 1)
303 --git-max-maintainers => maximum maintainers to add (default: 5)311 --git-max-maintainers => maximum maintainers to add (default: 5)
312 --git-min-percent => minimum percentage of commits required (default: 5)
304 --git-since => git history to use (default: 1-year-ago)313 --git-since => git history to use (default: 1-year-ago)
305 --m => include maintainer(s) if any314 --m => include maintainer(s) if any
306 --n => include name 'Full Name <addr\@domain.tld>'315 --n => include name 'Full Name <addr\@domain.tld>'
@@ -322,6 +331,15 @@ Other options: · 15 unmodified lines
322 --version => show version331 --version => show version
323 --help => show this help information332 --help => show this help information
324 333
334Notes:
335 Using "-f directory" may give unexpected results:
336
337 Used with "--git", git signators for _all_ files in and below
338 directory are examined as git recurses directories.
339 Any specified X: (exclude) pattern matches are _not_ ignored.
340 Used with "--nogit", directory is used as a pattern match,
341 no individual file within the directory or subdirectory
342 is matched.
325EOT343EOT
326}344}
327 345
@@ -482,6 +500,7 @@ sub recent_git_signoffs { · 154 unmodified lines
482 my $output = "";500 my $output = "";
483 my $count = 0;501 my $count = 0;
484 my @lines = ();502 my @lines = ();
503 my $total_sign_offs;
485 504
486 if (which("git") eq "") {505 if (which("git") eq "") {
487 warn("$P: git not found. Add --nogit to options?\n");506 warn("$P: git not found. Add --nogit to options?\n");
@@ -505,17 +524,26 @@ sub recent_git_signoffs { · 17 unmodified lines
505 $output =~ s/^\s*//gm;524 $output =~ s/^\s*//gm;
506 525
507 @lines = split("\n", $output);526 @lines = split("\n", $output);
527
528 $total_sign_offs = 0;
529 foreach my $line (@lines) {
530 if ($line =~ m/([0-9]+)\s+(.*)/) {
531 $total_sign_offs += $1;
532 } else {
533 die("$P: Unexpected git output: ${line}\n");
534 }
535 }
536
508 foreach my $line (@lines) {537 foreach my $line (@lines) {
509 if ($line =~ m/([0-9]+)\s+(.*)/) {538 if ($line =~ m/([0-9]+)\s+(.*)/) {
510 my $sign_offs = $1;539 my $sign_offs = $1;
511 $line = $2;540 $line = $2;
512 $count++;541 $count++;
513 if ($sign_offs < $email_git_min_signatures ||542 if ($sign_offs < $email_git_min_signatures ||
514 $count > $email_git_max_maintainers) {543 $count > $email_git_max_maintainers ||
544 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent) {
515 last;545 last;
516 }546 }
517 } else {
518 die("$P: Unexpected git output: ${line}\n");
519 }547 }
520 if ($line =~ m/(.+)<(.+)>/) {548 if ($line =~ m/(.+)<(.+)>/) {
521 my $git_name = $1;549 my $git_name = $1;
scripts/kconfig/lxdialog/util.c+2−0
@@ -19,6 +19,8 @@ · 18 unmodified lines
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 */20 */
21 21
22#include <stdarg.h>
23
22#include "dialog.h"24#include "dialog.h"
23 25
24struct dialog_info dlg;26struct dialog_info dlg;
scripts/kconfig/mconf.c+2−0
@@ -888,6 +888,8 @@ int main(int ac, char **av) · 887 unmodified lines
888 single_menu_mode = 1;888 single_menu_mode = 1;
889 }889 }
890 890
891 initscr();
892
891 getyx(stdscr, saved_y, saved_x);893 getyx(stdscr, saved_y, saved_x);
892 if (init_dialog(NULL)) {894 if (init_dialog(NULL)) {
893 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));895 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
scripts/markup_oops.pl+3−2
@@ -1,6 +1,7 @@
1#!/usr/bin/perl1#!/usr/bin/perl
2 2
3use File::Basename;3use File::Basename;
4use Math::BigInt;
4 5
5# Copyright 2008, Intel Corporation6# Copyright 2008, Intel Corporation
6#7#
@@ -172,8 +173,8 @@ while (<STDIN>) { · 165 unmodified lines
172 parse_x86_regs($line);173 parse_x86_regs($line);
173}174}
174 175
175my $decodestart = hex($target) - hex($func_offset);176my $decodestart = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex("0x$func_offset");
176my $decodestop = hex($target) + 8192;177my $decodestop = Math::BigInt->from_hex("0x$target") + 8192;
177if ($target eq "0") {178if ($target eq "0") {
178 print "No oops found!\n";179 print "No oops found!\n";
179 print "Usage: \n";180 print "Usage: \n";
scripts/package/builddeb+3−1
@@ -16,6 +16,8 @@ create_package() { · 15 unmodified lines
16 local pname="$1" pdir="$2"16 local pname="$1" pdir="$2"
17 17
18 cp debian/copyright "$pdir/usr/share/doc/$pname/"18 cp debian/copyright "$pdir/usr/share/doc/$pname/"
19 cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
20 gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
19 21
20 # Fix ownership and permissions22 # Fix ownership and permissions
21 chown -R root:root "$pdir"23 chown -R root:root "$pdir"
@@ -87,7 +89,7 @@ for script in postinst postrm preinst prerm ; do · 65 unmodified lines
87set -e89set -e
88 90
89# Pass maintainer script parameters to hook scripts91# Pass maintainer script parameters to hook scripts
90export DEB_MAINT_PARAMS="\$@"92export DEB_MAINT_PARAMS="\$*"
91 93
92test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d94test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
93exit 095exit 0
scripts/recordmcount.pl+8−4
@@ -393,7 +393,7 @@ while (<IN>) { · 392 unmodified lines
393 $read_function = 0;393 $read_function = 0;
394 }394 }
395 # print out any recorded offsets395 # print out any recorded offsets
396 update_funcs() if ($text_found);396 update_funcs() if (defined($ref_func));
397 397
398 # reset all markers and arrays398 # reset all markers and arrays
399 $text_found = 0;399 $text_found = 0;
@@ -403,7 +403,6 @@ while (<IN>) { · 3 unmodified lines
403 # section found, now is this a start of a function?403 # section found, now is this a start of a function?
404 } elsif ($read_function && /$function_regex/) {404 } elsif ($read_function && /$function_regex/) {
405 $text_found = 1;405 $text_found = 1;
406 $offset = hex $1;
407 $text = $2;406 $text = $2;
408 407
409 # if this is either a local function or a weak function408 # if this is either a local function or a weak function
@@ -412,10 +411,15 @@ while (<IN>) { · 2 unmodified lines
412 if (!defined($locals{$text}) && !defined($weak{$text})) {411 if (!defined($locals{$text}) && !defined($weak{$text})) {
413 $ref_func = $text;412 $ref_func = $text;
414 $read_function = 0;413 $read_function = 0;
414 $offset = hex $1;
415 } else {415 } else {
416 # if we already have a function, and this is weak, skip it416 # if we already have a function, and this is weak, skip it
417 if (!defined($ref_func) || !defined($weak{$text})) {417 if (!defined($ref_func) && !defined($weak{$text}) &&
418 # PPC64 can have symbols that start with .L and
419 # gcc considers these special. Don't use them!
420 $text !~ /^\.L/) {
418 $ref_func = $text;421 $ref_func = $text;
422 $offset = hex $1;
419 }423 }
420 }424 }
421 } elsif ($read_headers && /$mcount_section/) {425 } elsif ($read_headers && /$mcount_section/) {
@@ -440,7 +444,7 @@ while (<IN>) { · 18 unmodified lines
440}444}
441 445
442# dump out anymore offsets that may have been found446# dump out anymore offsets that may have been found
443update_funcs() if ($text_found);447update_funcs() if (defined($ref_func));
444 448
445# If we did not find any mcount callers, we are done (do nothing).449# If we did not find any mcount callers, we are done (do nothing).
446if (!$opened) {450if (!$opened) {