diff --git a/[refs] b/[refs] index ae6d48e47359..479f9c0adb7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 383099fd636deacf698b91b4c96d0d6d01e6dc79 +refs/heads/master: 5fe3af119bed58d240e2097fe76f322ab51902d7 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 9208ec64af9d..c79abb41793d 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -116,7 +116,8 @@ __(?:mem|cpu|dev|)(?:initdata|init)| ____cacheline_aligned| ____cacheline_aligned_in_smp| - ____cacheline_internodealigned_in_smp + ____cacheline_internodealigned_in_smp| + __weak }x; our $Modifier; our $Inline = qr{inline|__always_inline|noinline};