lkml.org 
[lkml]   [2023]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2.1 04/24] arm64/cpu: Mark cpu_die() __noreturn
    cpu_die() doesn't return.  Annotate it as such.  By extension this also
    makes arch_cpu_idle_dead() noreturn.

    Acked-by: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
    ---
    arch/arm64/include/asm/smp.h | 2 +-
    arch/arm64/kernel/smp.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
    index fc55f5a57a06..5733a31bab08 100644
    --- a/arch/arm64/include/asm/smp.h
    +++ b/arch/arm64/include/asm/smp.h
    @@ -100,7 +100,7 @@ static inline void arch_send_wakeup_ipi_mask(const struct cpumask *mask)
    extern int __cpu_disable(void);

    extern void __cpu_die(unsigned int cpu);
    -extern void cpu_die(void);
    +extern void __noreturn cpu_die(void);
    extern void cpu_die_early(void);

    static inline void cpu_park_loop(void)
    diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
    index 4e8327264255..d5d09a18b4f8 100644
    --- a/arch/arm64/kernel/smp.c
    +++ b/arch/arm64/kernel/smp.c
    @@ -361,7 +361,7 @@ void __cpu_die(unsigned int cpu)
    * Called from the idle thread for the CPU which has been shutdown.
    *
    */
    -void cpu_die(void)
    +void __noreturn cpu_die(void)
    {
    unsigned int cpu = smp_processor_id();
    const struct cpu_operations *ops = get_cpu_ops(cpu);
    --
    2.39.1
    \
     
     \ /
      Last update: 2023-03-27 00:26    [W:4.070 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site