Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

Pull arm64 updates from Will Deacon:
 - Errata workarounds for Qualcomm's Falkor CPU
 - Qualcomm L2 Cache PMU driver
 - Qualcomm SMCCC firmware quirk
 - Support for DEBUG_VIRTUAL
 - CPU feature detection for userspace via MRS emulation
 - Preliminary work for the Statistical Profiling Extension
 - Misc cleanups and non-critical fixes

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (74 commits)
  arm64/kprobes: consistently handle MRS/MSR with XZR
  arm64: cpufeature: correctly handle MRS to XZR
  arm64: traps: correctly handle MRS/MSR with XZR
  arm64: ptrace: add XZR-safe regs accessors
  arm64: include asm/assembler.h in entry-ftrace.S
  arm64: fix warning about swapper_pg_dir overflow
  arm64: Work around Falkor erratum 1003
  arm64: head.S: Enable EL1 (host) access to SPE when entered at EL2
  arm64: arch_timer: document Hisilicon erratum 161010101
  arm64: use is_vmalloc_addr
  arm64: use linux/sizes.h for constants
  arm64: uaccess: consistently check object sizes
  perf: add qcom l2 cache perf events driver
  arm64: remove wrong CONFIG_PROC_SYSCTL ifdef
  ARM: smccc: Update HVC comment to describe new quirk parameter
  arm64: do not trace atomic operations
  ACPI/IORT: Fix the error return code in iort_add_smmu_platform_device()
  ACPI/IORT: Fix iort_node_get_id() mapping entries indexing
  arm64: mm: enable CONFIG_HOLES_IN_ZONE for NUMA
  perf: xgene: Include module.h
  ...

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.debug
Simple merge

diff --cc arch/arm64/include/asm/assembler.h
Simple merge

diff --cc arch/arm64/include/asm/memory.h
Simple merge

diff --cc arch/arm64/kernel/insn.c
index 67f9cb9e8512824dbe358a54f6d15dd48c6f33c7,022d4a9d1738789cd25090b090a0af642181db18..b6badff5a15114224eb7d3d08810d79979618602
--- 1/arch/arm64/kernel/insn.c
--- 2/arch/arm64/kernel/insn.c
+++ b/arch/arm64/kernel/insn.c
@@@ -93,10 -93,10 +93,10 @@@ static void __kprobes *patch_map(void *
        bool module = !core_kernel_text(uintaddr);
        struct page *page;
  
 -      if (module && IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX))
 +      if (module && IS_ENABLED(CONFIG_STRICT_MODULE_RWX))
                page = vmalloc_to_page(addr);
        else if (!module)
-               page = pfn_to_page(PHYS_PFN(__pa(addr)));
+               page = phys_to_page(__pa_symbol(addr));
        else
                return addr;
  

diff --cc arch/arm64/kernel/topology.c
Simple merge

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/acpi/arm64/iort.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/cpuhotplug.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge