summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2008-07-23 21:29:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 10:47:26 -0700
commit292f1a9b342d763f94ea3915726a48905be4acd1 (patch)
tree599e54b48cddb386cd373520ad85a4dc13b7087d /scripts
parent74048ed811152a995a88945ba9e0dded34adfff4 (diff)
downloadlinux-stable-292f1a9b342d763f94ea3915726a48905be4acd1.tar.gz
linux-stable-292f1a9b342d763f94ea3915726a48905be4acd1.tar.bz2
linux-stable-292f1a9b342d763f94ea3915726a48905be4acd1.zip
checkpatch: complex macros need to ignore comments
Ensure we ignore comments in complex macro detection else we incorrectly report this: #define PFM_GROUP_PERM_ANY -1 /* any user/group */ Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8afa88aaed96..96a762be5748 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1972,6 +1972,7 @@ sub process {
} else {
$dstat =~ s/^.\s*\#\s*define\s+$Ident\s*//;
}
+ $dstat =~ s/$;//g;
$dstat =~ s/\\\n.//g;
$dstat =~ s/^\s*//s;
$dstat =~ s/\s*$//s;