In message: Re: [linux-yocto] arm_sdei: Drop the wrong declaration of sdei_init() on 27/09/2023 Kevin Hao wrote:
> On Wed, Sep 27, 2023 at 06:53:44PM +0800, Kevin Hao wrote: > > 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 > > Sorry, two typos. The branches should be: > v5.15/standard/cn-sdkv5.4/octeon > v5.15/standard/preempt-rt/cn-sdkv5.4/octeon merged. Bruce > > Thanks, > Kevin > > > > > 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 (#13134): https://lists.yoctoproject.org/g/linux-yocto/message/13134 Mute This Topic: https://lists.yoctoproject.org/mt/101614739/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
