diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-09-17 15:45:05 -0300 |
| commit | 056c1722014104b70d36fe71b683f71637f1a708 (patch) | |
| tree | 8236ab2e3f32d9dd2f82ca6045a6f82bd1b0d1e9 /tools/perf/pmu-events/arch | |
| parent | 8366f0d268c20929d82d4b1407bd4c6f9232bdec (diff) | |
| parent | 5925fa68fe8244651b3f78a88c4af99190a88f0d (diff) | |
| download | linux-stable-056c1722014104b70d36fe71b683f71637f1a708.tar.gz linux-stable-056c1722014104b70d36fe71b683f71637f1a708.tar.bz2 linux-stable-056c1722014104b70d36fe71b683f71637f1a708.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/pmu-events/arch')
| -rw-r--r-- | tools/perf/pmu-events/arch/x86/amdzen1/core.json | 2 | ||||
| -rw-r--r-- | tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/pmu-events/arch/x86/amdzen1/core.json b/tools/perf/pmu-events/arch/x86/amdzen1/core.json index 7e1aa8273935..653b11b23399 100644 --- a/tools/perf/pmu-events/arch/x86/amdzen1/core.json +++ b/tools/perf/pmu-events/arch/x86/amdzen1/core.json @@ -61,7 +61,7 @@ { "EventName": "ex_ret_brn_ind_misp", "EventCode": "0xca", - "BriefDescription": "Retired Indirect Branch Instructions Mispredicted.", + "BriefDescription": "Retired Indirect Branch Instructions Mispredicted." }, { "EventName": "ex_ret_mmx_fp_instr.sse_instr", diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json index de89e5a44ff1..4b75183da94a 100644 --- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json +++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json @@ -125,6 +125,6 @@ { "EventName": "ex_ret_fus_brnch_inst", "EventCode": "0x1d0", - "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.", + "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8." } ] |