diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-22 08:36:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-22 08:36:16 -0700 |
commit | 54dee406374ce8adb352c48e175176247cb8db7c (patch) | |
tree | 5a935f0e3bdbd28d869f5cd319891023e1152a3a /drivers/perf | |
parent | 651bae980e3f3e6acf0d297ced08f9d7af71a8c9 (diff) | |
parent | 7a0a93c51799edc45ee57c6cc1679aa94f1e03d5 (diff) | |
download | linux-54dee406374ce8adb352c48e175176247cb8db7c.tar.gz linux-54dee406374ce8adb352c48e175176247cb8db7c.tar.bz2 linux-54dee406374ce8adb352c48e175176247cb8db7c.zip |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
- Fix SPE probe failure when backing auxbuf with high-order pages
- Fix handling of DMA allocations from outside of the vmalloc area
- Fix generation of build-id ELF section for vDSO object
- Disable huge I/O mappings if kernel page table dumping is enabled
- A few other minor fixes (comments, kconfig etc)
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: vdso: Explicitly add build-id option
arm64/mm: Inhibit huge-vmap with ptdump
arm64: Print physical address of page table base in show_pte()
arm64: don't trash config with compat symbol if COMPAT is disabled
arm64: assembler: Update comment above cond_yield_neon() macro
drivers/perf: arm_spe: Don't error on high-order pages for aux buf
arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable
Diffstat (limited to 'drivers/perf')
-rw-r--r-- | drivers/perf/arm_spe_pmu.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 7cb766dafe85..e120f933412a 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -855,16 +855,8 @@ static void *arm_spe_pmu_setup_aux(struct perf_event *event, void **pages, if (!pglist) goto out_free_buf; - for (i = 0; i < nr_pages; ++i) { - struct page *page = virt_to_page(pages[i]); - - if (PagePrivate(page)) { - pr_warn("unexpected high-order page for auxbuf!"); - goto out_free_pglist; - } - + for (i = 0; i < nr_pages; ++i) pglist[i] = virt_to_page(pages[i]); - } buf->base = vmap(pglist, nr_pages, VM_MAP, PAGE_KERNEL); if (!buf->base) |