diff options
author | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /scripts | |
parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/checkpatch.pl | 3 | ||||
-rwxr-xr-x | scripts/kernel-doc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 913d6bdfdda3..ca05ba217f5f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3016,7 +3016,8 @@ sub process { $herectx .= raw_line($linenr, $n) . "\n"; } - if (($stmts =~ tr/;/;/) == 1) { + if (($stmts =~ tr/;/;/) == 1 && + $stmts !~ /^\s*(if|while|for|switch)\b/) { WARN("SINGLE_STATEMENT_DO_WHILE_MACRO", "Single statement macros should not use a do {} while (0) loop\n" . "$herectx"); } diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 9b0c0b8b4ab4..8fd107a3fac4 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1786,6 +1786,7 @@ sub dump_function($$) { $prototype =~ s/__init +//; $prototype =~ s/__init_or_module +//; $prototype =~ s/__must_check +//; + $prototype =~ s/__weak +//; $prototype =~ s/^#\s*define\s+//; #ak added $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; |