diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-19 08:04:35 -0500 |
| commit | 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a (patch) | |
| tree | e1133482f365abf9103e91538cc0e8e29806abe9 /scripts | |
| parent | b4dabf9587d8e1d5d5edc6d3326021e390b9a532 (diff) | |
| parent | 25a118130fde0d20b0f5a223642849b392b2f2ee (diff) | |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 075b6149a..70a2111d1 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2068,8 +2068,10 @@ sub process { } # , must have a space on the right. + # not required when having a single },{ on one line } elsif ($op eq ',') { - if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/) { + if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ && + ($elements[$n] . $elements[$n + 2]) !~ " *}{") { ERROR("space required after that '$op' $at\n" . $hereptr); } |