diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
| commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
| tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /arch/powerpc/perf/power9-pmu.c | |
| parent | f06351f8c0c85e2d53e73c53a33b4ef55b4ad6de (diff) | |
| parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) | |
| download | linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.gz linux-d0a31acc34dc2921ad32a67a7534704114e64f82.tar.bz2 linux-d0a31acc34dc2921ad32a67a7534704114e64f82.zip | |
Merge tag 'v5.18-rc4' into next
Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
Diffstat (limited to 'arch/powerpc/perf/power9-pmu.c')
| -rw-r--r-- | arch/powerpc/perf/power9-pmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c index 40834fbb4d2c..3ad40ffb9256 100644 --- a/arch/powerpc/perf/power9-pmu.c +++ b/arch/powerpc/perf/power9-pmu.c @@ -133,11 +133,11 @@ static int p9_dd22_bl_ev[] = { /* Table of alternatives, sorted by column 0 */ static const unsigned int power9_event_alternatives[][MAX_ALT] = { - { PM_INST_DISP, PM_INST_DISP_ALT }, - { PM_RUN_CYC_ALT, PM_RUN_CYC }, - { PM_RUN_INST_CMPL_ALT, PM_RUN_INST_CMPL }, - { PM_LD_MISS_L1, PM_LD_MISS_L1_ALT }, { PM_BR_2PATH, PM_BR_2PATH_ALT }, + { PM_INST_DISP, PM_INST_DISP_ALT }, + { PM_RUN_CYC_ALT, PM_RUN_CYC }, + { PM_LD_MISS_L1, PM_LD_MISS_L1_ALT }, + { PM_RUN_INST_CMPL_ALT, PM_RUN_INST_CMPL }, }; static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[]) |