diff options
| author | Will Deacon <will@kernel.org> | 2023-08-25 14:36:04 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-08-25 14:36:04 +0300 |
| commit | 438ddc3c4255dc43f726a2207d37954188b63241 (patch) | |
| tree | 19eef8fc47087682b553c5dde4749f368f1a4902 /include/linux | |
| parent | d36dccca324476b16ebe68e722c9534de17fb036 (diff) | |
| parent | d232606773a0b09ec7f1ffc25f63abe801d011fd (diff) | |
| download | linux-438ddc3c4255dc43f726a2207d37954188b63241.tar.xz | |
Merge branch 'for-next/misc' into for-next/core
* for-next/misc:
arm64/sysreg: refactor deprecated strncpy
arm64: sysreg: Generate C compiler warnings on {read,write}_sysreg_s arguments
arm64: sdei: abort running SDEI handlers during crash
arm64: Explicitly include correct DT includes
arm64/Kconfig: Sort the RCpc feature under the ARMv8.3 features menu
arm64: vdso: remove two .altinstructions related symbols
arm64/ptrace: Clean up error handling path in sve_set_common()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/arm_sdei.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h index 14dc461b0e82..255701e1251b 100644 --- a/include/linux/arm_sdei.h +++ b/include/linux/arm_sdei.h @@ -47,10 +47,12 @@ int sdei_unregister_ghes(struct ghes *ghes); int sdei_mask_local_cpu(void); int sdei_unmask_local_cpu(void); void __init sdei_init(void); +void sdei_handler_abort(void); #else static inline int sdei_mask_local_cpu(void) { return 0; } static inline int sdei_unmask_local_cpu(void) { return 0; } static inline void sdei_init(void) { } +static inline void sdei_handler_abort(void) { } #endif /* CONFIG_ARM_SDE_INTERFACE */ |