diff options
| author | Will Deacon <will@kernel.org> | 2025-05-27 12:23:32 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2025-05-27 12:23:32 +0100 |
| commit | 9bd2e7c65c8977c2a06e4c144a59a7ef24a017ce (patch) | |
| tree | 70aba5d3e186278d2e35b7266bbe0c9b81baa75e /include/linux | |
| parent | 0af2f6be1b4281385b618cb86ad946eded089ac8 (diff) | |
| parent | 59529bbe642de4eb2191a541d9b4bae7eb73862e (diff) | |
Merge branch 'for-next/acpi' into for-next/core
* for-next/acpi:
firmware: SDEI: Allow sdei initialization without ACPI_APEI_GHES
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/arm_sdei.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h index 255701e1251b..f652a5028b59 100644 --- a/include/linux/arm_sdei.h +++ b/include/linux/arm_sdei.h @@ -46,12 +46,12 @@ int sdei_unregister_ghes(struct ghes *ghes); /* For use by arch code when CPU hotplug notifiers are not appropriate. */ int sdei_mask_local_cpu(void); int sdei_unmask_local_cpu(void); -void __init sdei_init(void); +void __init acpi_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 acpi_sdei_init(void) { } static inline void sdei_handler_abort(void) { } #endif /* CONFIG_ARM_SDE_INTERFACE */ |