diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-10-22 01:15:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-10-22 01:15:32 +0200 |
| commit | aa7a7b72974a4612a85bb395a4b23b973ffc7d2b (patch) | |
| tree | 35c61f29a9a2876f609a2f7827f1094c4c392dc3 /arch/x86/events/intel | |
| parent | perf/core: Fix !CONFIG_PERF_EVENTS build warnings and failures (diff) | |
| parent | perf/aux: Fix tracking of auxiliary trace buffer allocation (diff) | |
| download | linux-dev-aa7a7b72974a4612a85bb395a4b23b973ffc7d2b.tar.xz linux-dev-aa7a7b72974a4612a85bb395a4b23b973ffc7d2b.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel')
| -rw-r--r-- | arch/x86/events/intel/pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 74e80ed9c6c4..05e43d0f430b 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -627,7 +627,7 @@ static struct topa *topa_alloc(int cpu, gfp_t gfp) * link as the 2nd entry in the table */ if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries)) { - TOPA_ENTRY(&tp->topa, 1)->base = page_to_phys(p); + TOPA_ENTRY(&tp->topa, 1)->base = page_to_phys(p) >> TOPA_SHIFT; TOPA_ENTRY(&tp->topa, 1)->end = 1; } |