summaryrefslogtreecommitdiff
path: root/scripts/checkpatch.pl
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-12-19 16:56:10 +0400
committerIngo Molnar <mingo@kernel.org>2013-12-19 16:56:10 +0400
commit3331e924e7c5b98d245531b181551cb2a7380d0e (patch)
tree25c4432afd79bedc1e8941415166a5cef0c168fb /scripts/checkpatch.pl
parentfd8526ad14c182605e42b64646344b95befd9f94 (diff)
parent319e2e3f63c348a9b66db4667efa73178e18b17d (diff)
downloadlinux-3331e924e7c5b98d245531b181551cb2a7380d0e.tar.xz
Merge tag 'v3.13-rc4' into x86/mm
Pick up the latest fixes before applying new patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/checkpatch.pl')
-rwxr-xr-xscripts/checkpatch.pl1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 61090e0ff613..9c9810030377 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3289,6 +3289,7 @@ sub process {
}
}
if (!defined $suppress_whiletrailers{$linenr} &&
+ defined($stat) && defined($cond) &&
$line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
my ($s, $c) = ($stat, $cond);