diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-11-05 11:00:40 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-05 11:00:40 +0100 |
| commit | c196924277ea82200d4c4fd9537c71390b96f247 (patch) | |
| tree | 2f76c094c3adee9c041e9e89a9431c5c7ef08e85 /arch/x86/events/intel/pt.c | |
| parent | gpio: Add xgs-iproc driver (diff) | |
| parent | Linux 5.4-rc6 (diff) | |
| download | linux-c196924277ea82200d4c4fd9537c71390b96f247.tar.xz linux-c196924277ea82200d4c4fd9537c71390b96f247.zip | |
Merge tag 'v5.4-rc6' into devel
Linux 5.4-rc6
Diffstat (limited to 'arch/x86/events/intel/pt.c')
| -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; } |