diff options
| author | Marc Zyngier <maz@kernel.org> | 2025-05-23 10:57:32 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2025-05-23 10:57:32 +0100 |
| commit | cb86616c39f8be7b9eaf0db4508b47d328b91e80 (patch) | |
| tree | 65a590f339181ae2c0a237f3b54c5743d3586731 /include/linux | |
| parent | a90e0017541dbd2e6c1e40e501efefc938590390 (diff) | |
| parent | 446692759b0732ef2d9a93b7e6730aa762ccf0ab (diff) | |
Merge branch kvm-arm64/ubsan-el2 into kvmarm-master/next
* kvm-arm64/ubsan-el2:
: .
: Add UBSAN support to the EL2 portion of KVM, reusing most of the
: existing logic provided by CONFIG_IBSAN_TRAP.
:
: Patches courtesy of Mostafa Saleh.
: .
KVM: arm64: Handle UBSAN faults
KVM: arm64: Introduce CONFIG_UBSAN_KVM_EL2
ubsan: Remove regs from report_ubsan_failure()
arm64: Introduce esr_is_ubsan_brk()
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ubsan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ubsan.h b/include/linux/ubsan.h index d8219cbe09ff..3ab8d38aedb8 100644 --- a/include/linux/ubsan.h +++ b/include/linux/ubsan.h @@ -2,10 +2,10 @@ #ifndef _LINUX_UBSAN_H #define _LINUX_UBSAN_H -#ifdef CONFIG_UBSAN_TRAP -const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type); +#if defined(CONFIG_UBSAN_TRAP) || defined(CONFIG_UBSAN_KVM_EL2) +const char *report_ubsan_failure(u32 check_type); #else -static inline const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type) +static inline const char *report_ubsan_failure(u32 check_type) { return NULL; } |