diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-14 22:57:18 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-14 22:57:18 +1000 |
| commit | 960e3708135ac8b03ef3d1fa773e369cfacc76b9 (patch) | |
| tree | 3b3b679d211377a291a55fb9598d1c7f408aeab9 /arch/powerpc/perf/imc-pmu.c | |
| parent | dc462267d2d7aacffc3c1d99b02d7a7c59db7c66 (diff) | |
| parent | 0460534b532e5518c657c7d6492b9337d975eaa3 (diff) | |
| download | linux-stable-960e3708135ac8b03ef3d1fa773e369cfacc76b9.tar.gz linux-stable-960e3708135ac8b03ef3d1fa773e369cfacc76b9.tar.bz2 linux-stable-960e3708135ac8b03ef3d1fa773e369cfacc76b9.zip | |
Merge branch 'fixes' into next
Bring in our fixes branch for this cycle which avoids some small
conflicts with upcoming commits.
Diffstat (limited to 'arch/powerpc/perf/imc-pmu.c')
| -rw-r--r-- | arch/powerpc/perf/imc-pmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 00bb186caed9..9ed4fcccf8a9 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -1289,7 +1289,7 @@ static int trace_imc_prepare_sample(struct trace_imc_data *mem, header->misc = 0; if (cpu_has_feature(CPU_FTR_ARCH_31)) { - switch (IMC_TRACE_RECORD_VAL_HVPR(mem->val)) { + switch (IMC_TRACE_RECORD_VAL_HVPR(be64_to_cpu(READ_ONCE(mem->val)))) { case 0:/* when MSR HV and PR not set in the trace-record */ header->misc |= PERF_RECORD_MISC_GUEST_KERNEL; break; @@ -1297,7 +1297,7 @@ static int trace_imc_prepare_sample(struct trace_imc_data *mem, header->misc |= PERF_RECORD_MISC_GUEST_USER; break; case 2: /* MSR HV is 1 and PR is 0 */ - header->misc |= PERF_RECORD_MISC_HYPERVISOR; + header->misc |= PERF_RECORD_MISC_KERNEL; break; case 3: /* MSR HV is 1 and PR is 1 */ header->misc |= PERF_RECORD_MISC_USER; |