From: Kevin Hao <[email protected]> These were added mistakenly when fixing the merge conflicts.
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following two branches: v5.15/standard/cn-sdkv5.15/octeon v5.15/standard/preempt-rt/cn-sdkv5.15/octeon include/linux/arm_sdei.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/arm_sdei.h b/include/linux/arm_sdei.h index 255701e1251b..a5bb250d7306 100644 --- a/include/linux/arm_sdei.h +++ b/include/linux/arm_sdei.h @@ -46,12 +46,10 @@ 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 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 */ -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13127): https://lists.yoctoproject.org/g/linux-yocto/message/13127 Mute This Topic: https://lists.yoctoproject.org/mt/101614739/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
