From: Catalin Marinas Date: Fri, 30 Sep 2022 08:18:26 +0000 (+0100) Subject: Merge branch 'for-next/misc' into for-next/core X-Git-Tag: block-6.1-2022-13-10~55^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=53630a1f6186e9df5fb75e9b55328e22b64de150;p=linux-block.git Merge branch 'for-next/misc' into for-next/core * for-next/misc: : Miscellaneous patches arm64/kprobe: Optimize the performance of patching single-step slot ARM64: reloc_test: add __init/__exit annotations to module init/exit funcs arm64/mm: fold check for KFENCE into can_set_direct_map() arm64: uaccess: simplify uaccess_mask_ptr() arm64: mte: move register initialization to C arm64: mm: handle ARM64_KERNEL_USES_PMD_MAPS in vmemmap_populate() arm64: dma: Drop cache invalidation from arch_dma_prep_coherent() arm64: support huge vmalloc mappings arm64: spectre: increase parameters that can be used to turn off bhb mitigation individually arm64: run softirqs on the per-CPU IRQ stack arm64: compat: Implement misalignment fixups for multiword loads --- 53630a1f6186e9df5fb75e9b55328e22b64de150 diff --cc arch/arm64/include/asm/exception.h index 0278a58abe69,e92ca08f754c..19713d0f013b --- a/arch/arm64/include/asm/exception.h +++ b/arch/arm64/include/asm/exception.h @@@ -71,10 -70,10 +71,11 @@@ void do_sysinstr(unsigned long esr, str void do_sp_pc_abort(unsigned long addr, unsigned long esr, struct pt_regs *regs); void bad_el0_sync(struct pt_regs *regs, int reason, unsigned long esr); void do_cp15instr(unsigned long esr, struct pt_regs *regs); + int do_compat_alignment_fixup(unsigned long addr, struct pt_regs *regs); void do_el0_svc(struct pt_regs *regs); void do_el0_svc_compat(struct pt_regs *regs); -void do_ptrauth_fault(struct pt_regs *regs, unsigned long esr); +void do_el0_fpac(struct pt_regs *regs, unsigned long esr); +void do_el1_fpac(struct pt_regs *regs, unsigned long esr); void do_serror(struct pt_regs *regs, unsigned long esr); void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags);