diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2022-05-20 20:51:54 +0300 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2022-05-20 20:51:54 +0300 |
| commit | 0616ea3f1b93a99264d84f3d002ae117f6526b62 (patch) | |
| tree | f805067a257b1e467ffe38bb43b7f8c148a19101 /arch/arm64/kernel/fpsimd.c | |
| parent | d6fc5db0f82828c74742319cb6c988c4a8aac535 (diff) | |
| parent | 18f3976fdb5da2ba9572845e6f7dfb58652871ea (diff) | |
| download | linux-0616ea3f1b93a99264d84f3d002ae117f6526b62.tar.xz | |
Merge branch 'for-next/esr-elx-64-bit' into for-next/core
* for-next/esr-elx-64-bit:
: Treat ESR_ELx as a 64-bit register.
KVM: arm64: uapi: Add kvm_debug_exit_arch.hsr_high
KVM: arm64: Treat ESR_EL2 as a 64-bit register
arm64: Treat ESR_ELx as a 64-bit register
arm64: compat: Do not treat syscall number as ESR_ELx for a bad syscall
arm64: Make ESR_ELx_xVC_IMM_MASK compatible with assembly
Diffstat (limited to 'arch/arm64/kernel/fpsimd.c')
| -rw-r--r-- | arch/arm64/kernel/fpsimd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index c5677aa2e9e6..819979398127 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -1381,7 +1381,7 @@ static void sve_init_regs(void) * would have disabled the SVE access trap for userspace during * ret_to_user, making an SVE access trap impossible in that case. */ -void do_sve_acc(unsigned int esr, struct pt_regs *regs) +void do_sve_acc(unsigned long esr, struct pt_regs *regs) { /* Even if we chose not to use SVE, the hardware could still trap: */ if (unlikely(!system_supports_sve()) || WARN_ON(is_compat_task())) { @@ -1423,7 +1423,7 @@ void do_sve_acc(unsigned int esr, struct pt_regs *regs) * would have disabled the SME access trap for userspace during * ret_to_user, making an SVE access trap impossible in that case. */ -void do_sme_acc(unsigned int esr, struct pt_regs *regs) +void do_sme_acc(unsigned long esr, struct pt_regs *regs) { /* Even if we chose not to use SME, the hardware could still trap: */ if (unlikely(!system_supports_sme()) || WARN_ON(is_compat_task())) { @@ -1478,7 +1478,7 @@ void do_sme_acc(unsigned int esr, struct pt_regs *regs) /* * Trapped FP/ASIMD access. */ -void do_fpsimd_acc(unsigned int esr, struct pt_regs *regs) +void do_fpsimd_acc(unsigned long esr, struct pt_regs *regs) { /* TODO: implement lazy context saving/restoring */ WARN_ON(1); @@ -1487,7 +1487,7 @@ void do_fpsimd_acc(unsigned int esr, struct pt_regs *regs) /* * Raise a SIGFPE for the current process. */ -void do_fpsimd_exc(unsigned int esr, struct pt_regs *regs) +void do_fpsimd_exc(unsigned long esr, struct pt_regs *regs) { unsigned int si_code = FPE_FLTUNK; |