History

Merge 4.15-rc6 into char-misc-next

We want the fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit b6a09412 parents db80985 30a7acd806 files · +9728 −5643Browse files

Showing the changes to scripts (2 of 806 files). Show all

Unified · Split

2 files
  1. scripts/checkpatch.pl +0 −22
  2. scripts/faddr2line +4 −4
scripts/checkpatch.pl+0−22
@@ -6233,28 +6233,6 @@ sub process { · 6232 unmodified lines
62336233 }
62346234 }
62356235
6236−# whine about ACCESS_ONCE
6237− if ($^V && $^V ge 5.10.0 &&
6238− $line =~ /\bACCESS_ONCE\s*$balanced_parens\s*(=(?!=))?\s*($FuncArg)?/) {
6239− my $par = $1;
6240− my $eq = $2;
6241− my $fun = $3;
6242− $par =~ s/^\(\s*(.*)\s*\)$/$1/;
6243− if (defined($eq)) {
6244− if (WARN("PREFER_WRITE_ONCE",
6245− "Prefer WRITE_ONCE(<FOO>, <BAR>) over ACCESS_ONCE(<FOO>) = <BAR>\n" . $herecurr) &&
6246− $fix) {
6247− $fixed[$fixlinenr] =~ s/\bACCESS_ONCE\s*\(\s*\Q$par\E\s*\)\s*$eq\s*\Q$fun\E/WRITE_ONCE($par, $fun)/;
6248− }
6249− } else {
6250− if (WARN("PREFER_READ_ONCE",
6251− "Prefer READ_ONCE(<FOO>) over ACCESS_ONCE(<FOO>)\n" . $herecurr) &&
6252− $fix) {
6253− $fixed[$fixlinenr] =~ s/\bACCESS_ONCE\s*\(\s*\Q$par\E\s*\)/READ_ONCE($par)/;
6254− }
6255− }
6256− }
6257−
62586236 # check for mutex_trylock_recursive usage
62596237 if ($line =~ /mutex_trylock_recursive/) {
62606238 ERROR("LOCKING",
scripts/faddr2line+4−4
@@ -44,10 +44,10 @@ · 43 unmodified lines
4444 set -o errexit
4545 set -o nounset
4646
47−READELF="${CROSS_COMPILE}readelf"
48−ADDR2LINE="${CROSS_COMPILE}addr2line"
49−SIZE="${CROSS_COMPILE}size"
50−NM="${CROSS_COMPILE}nm"
47+READELF="${CROSS_COMPILE:-}readelf"
48+ADDR2LINE="${CROSS_COMPILE:-}addr2line"
49+SIZE="${CROSS_COMPILE:-}size"
50+NM="${CROSS_COMPILE:-}nm"
5151
5252 command -v awk >/dev/null 2>&1 || die "awk isn't installed"
5353 command -v ${READELF} >/dev/null 2>&1 || die "readelf isn't installed"