git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rcu: Merge per-RCU-flavor initialization into pre-existing macro
[safe/jmp/linux-2.6]
/
scripts
/
checkpatch.pl
diff --git
a/scripts/checkpatch.pl
b/scripts/checkpatch.pl
index
15a5904
..
2d5ece7
100755
(executable)
--- a/
scripts/checkpatch.pl
+++ b/
scripts/checkpatch.pl
@@
-10,7
+10,7
@@
use strict;
my $P = $0;
$P =~ s@.*/@@g;
my $P = $0;
$P =~ s@.*/@@g;
-my $V = '0.2
7
';
+my $V = '0.2
8
';
use Getopt::Long qw(:config no_auto_abbrev);
use Getopt::Long qw(:config no_auto_abbrev);
@@
-110,7
+110,8
@@
our $Sparse = qr{
__iomem|
__must_check|
__init_refok|
__iomem|
__must_check|
__init_refok|
- __kprobes
+ __kprobes|
+ __ref
}x;
our $Attribute = qr{
const|
}x;
our $Attribute = qr{
const|
@@
-1584,9
+1585,9
@@
sub process {
}
# TEST: allow direct testing of the attribute matcher.
if ($dbg_attr) {
}
# TEST: allow direct testing of the attribute matcher.
if ($dbg_attr) {
- if ($line =~ /^.\s*$
Attribute
\s*$/) {
+ if ($line =~ /^.\s*$
Modifier
\s*$/) {
ERROR("TEST: is attr\n" . $herecurr);
ERROR("TEST: is attr\n" . $herecurr);
- } elsif ($dbg_attr > 1 && $line =~ /^.+($
Attribute
)/) {
+ } elsif ($dbg_attr > 1 && $line =~ /^.+($
Modifier
)/) {
ERROR("TEST: is not attr ($1 is)\n". $herecurr);
}
next;
ERROR("TEST: is not attr ($1 is)\n". $herecurr);
}
next;
@@
-1686,8
+1687,8
@@
sub process {
# Modifiers should have spaces.
$to =~ s/(\b$Modifier$)/$1 /;
# Modifiers should have spaces.
$to =~ s/(\b$Modifier$)/$1 /;
- #print "from<$from> to<$to>\n";
- if ($from ne $to) {
+ #print "from<$from> to<$to>
ident<$ident>
\n";
+ if ($from ne $to
&& $ident !~ /^$Modifier$/
) {
ERROR("\"foo${from}bar\" should be \"foo${to}bar\"\n" . $herecurr);
}
}
ERROR("\"foo${from}bar\" should be \"foo${to}bar\"\n" . $herecurr);
}
}