aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-08-06 16:11:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 18:01:29 -0700
commit3f7bc4e1fcfab05f3e8b49134cfb3e16b8876aae (patch)
tree89f94c82c8053f189518395bbbed66480471ebba /scripts
parent0fe3dc2bc554b849c27c0ebc36daedf032514200 (diff)
downloadlinux-3f7bc4e1fcfab05f3e8b49134cfb3e16b8876aae.tar.gz
checkpatch: add short int to c variable types
short int is one of the 6.7.2 c90 types. Find it appropriately. This fixes a defect in checkpatch where it suggests that a line break after declaration is required using an input like: int foo; short int bar; Without this change, it warns on the short int line. Signed-off-by: Joe Perches <joe@perches.com> Reported-by: Hartley Sweeten <HartleyS@visionengravers.com> Acked-by: Andy Whitcroft <apw@canonical.com> 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 dc72a9b3172d..c647caab913c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -356,6 +356,7 @@ our $signature_tags = qr{(?xi:
our @typeList = (
qr{void},
qr{(?:unsigned\s+)?char},
+ qr{(?:unsigned\s+)?short\s+int},
qr{(?:unsigned\s+)?short},
qr{(?:unsigned\s+)?int},
qr{(?:unsigned\s+)?long},