Commit fb35342f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'cocci-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux

Pull coccinelle updates from Julia Lawall:
 "Changes in make coccicheck and improve a semantic patch

  This makes a couple of changes in make coccicheck related to shell
  commands.

  It also updates the api/atomic_as_refcounter semantic patch to include
  WARNING in the output message, as done in other cases"

* tag 'cocci-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
  scripts: coccicheck: Use /usr/bin/env
  scripts: coccicheck: Avoid warning about spurious escape
  coccinelle: api/atomic_as_refcounter: include message type in output
parents 34c108a0 2b2d50bd
#!/bin/bash #!/usr/bin/env bash
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Linux kernel coccicheck # Linux kernel coccicheck
# #
...@@ -18,7 +18,7 @@ fi ...@@ -18,7 +18,7 @@ fi
SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
USE_JOBS="no" USE_JOBS="no"
$SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes" $SPATCH --help | grep -e "--jobs" > /dev/null && USE_JOBS="yes"
# The verbosity may be set by the environmental parameter V= # The verbosity may be set by the environmental parameter V=
# as for example with 'make V=1 coccicheck' # as for example with 'make V=1 coccicheck'
......
...@@ -55,7 +55,7 @@ identifier fname6 =~ ".*call_rcu.*"; ...@@ -55,7 +55,7 @@ identifier fname6 =~ ".*call_rcu.*";
p1 << r1.p1; p1 << r1.p1;
p2 << r1.p2; p2 << r1.p2;
@@ @@
msg = "atomic_dec_and_test variation before object free at line %s." msg = "WARNING: atomic_dec_and_test variation before object free at line %s."
coccilib.report.print_report(p1[0], msg % (p2[0].line)) coccilib.report.print_report(p1[0], msg % (p2[0].line))
@r4 exists@ @r4 exists@
...@@ -88,7 +88,7 @@ fname@p2(y, ...); ...@@ -88,7 +88,7 @@ fname@p2(y, ...);
p1 << r4.p1; p1 << r4.p1;
p2 << r4.p2; p2 << r4.p2;
@@ @@
msg = "atomic_dec_and_test variation before object free at line %s." msg = "WARNING: atomic_dec_and_test variation before object free at line %s."
coccilib.report.print_report(p1[0], msg % (p2[0].line)) coccilib.report.print_report(p1[0], msg % (p2[0].line))
@r2 exists@ @r2 exists@
...@@ -107,7 +107,7 @@ atomic64_add_unless(&(a)->x,-1,1)@p1 ...@@ -107,7 +107,7 @@ atomic64_add_unless(&(a)->x,-1,1)@p1
@script:python depends on report@ @script:python depends on report@
p1 << r2.p1; p1 << r2.p1;
@@ @@
msg = "atomic_add_unless" msg = "WARNING: atomic_add_unless"
coccilib.report.print_report(p1[0], msg) coccilib.report.print_report(p1[0], msg)
@r3 exists@ @r3 exists@
...@@ -126,5 +126,5 @@ x = atomic64_add_return@p1(-1, ...); ...@@ -126,5 +126,5 @@ x = atomic64_add_return@p1(-1, ...);
@script:python depends on report@ @script:python depends on report@
p1 << r3.p1; p1 << r3.p1;
@@ @@
msg = "x = atomic_add_return(-1, ...)" msg = "WARNING: x = atomic_add_return(-1, ...)"
coccilib.report.print_report(p1[0], msg) coccilib.report.print_report(p1[0], msg)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment