diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-12-04 05:36:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-04 05:36:51 -0800 |
| commit | a94efeebe062bd8818aee9ef70483bbd21f4f558 (patch) | |
| tree | faf5d422e172a8f5708aa2e912c83a552596a37e /tools | |
| parent | fbbb7d9af6faf01b3fe05f9a91d1a0b56049fc0a (diff) | |
| parent | ed0754412226e593ffccb7990b18eb4914ac77e7 (diff) | |
Merge "Merge android-4.4-p.204 (583bdda) into msm-4.4"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk | 4 | ||||
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk b/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk index 517567347aac..cd2faf0ca2e3 100644 --- a/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk +++ b/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk @@ -68,7 +68,7 @@ BEGIN { lprefix1_expr = "\\((66|!F3)\\)" lprefix2_expr = "\\(F3\\)" - lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)" + lprefix3_expr = "\\((F2|!F3|66&F2)\\)" lprefix_expr = "\\((66|F2|F3)\\)" max_lprefix = 4 @@ -253,7 +253,7 @@ function convert_operands(count,opnd, i,j,imm,mod) return add_flags(imm, mod) } -/^[0-9a-f]+\:/ { +/^[0-9a-f]+:/ { if (NR == 1) next # get index diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc index 231bcd2c4eb5..1e7ac6f3362f 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc @@ -71,8 +71,11 @@ test_badarg "\$stackp" "\$stack0+10" "\$stack1-10" echo "r ${PROBEFUNC} \$retval" > kprobe_events ! echo "p ${PROBEFUNC} \$retval" > kprobe_events +# $comm was introduced in 4.8, older kernels reject it. +if grep -A1 "fetcharg:" README | grep -q '\$comm' ; then : "Comm access" test_goodarg "\$comm" +fi : "Indirect memory access" test_goodarg "+0(${GOODREG})" "-0(${GOODREG})" "+10(\$stack)" \ |