diff --git a/[refs] b/[refs] index d2d003af65ae..b2966740dc08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 691e669ba8c64d31ac08d87b1751e6acfa3ff65e +refs/heads/master: 52131292c069b74f4b5f3c786ff66ff6e82b0e69 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 9a3894dbf752..1530dbf1dab5 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -145,11 +145,14 @@ sub help { __kprobes| __ref }x; + +# Notes to $Attribute: +# We need \b after 'init' otherwise 'initconst' will cause a false positive in a check our $Attribute = qr{ const| __read_mostly| __kprobes| - __(?:mem|cpu|dev|)(?:initdata|init)| + __(?:mem|cpu|dev|)(?:initdata|initconst|init\b)| ____cacheline_aligned| ____cacheline_aligned_in_smp| ____cacheline_internodealigned_in_smp|