| Message ID | 39835bc75af2e812fce56400533cb2ab41bcf0e2.1676358308.git.jpoimboe@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | cpu,sched: Mark arch_cpu_idle_dead() __noreturn | expand |
Hi Josh, On 14/2/23 08:05, Josh Poimboeuf wrote: > Include <asm/smp.h> to make sure play_dead() matches its prototype going > forward. > > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> > --- > arch/mips/kernel/smp-bmips.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c > index f5d7bfa3472a..df9158e8329d 100644 > --- a/arch/mips/kernel/smp-bmips.c > +++ b/arch/mips/kernel/smp-bmips.c > @@ -38,6 +38,7 @@ > #include <asm/traps.h> > #include <asm/barrier.h> > #include <asm/cpu-features.h> > +#include <asm/smp.h> What about the other implementations? $ git grep -L asm/smp.h $(git grep -wlF 'play_dead(void)' arch/mips) arch/mips/cavium-octeon/smp.c arch/mips/kernel/smp-bmips.c arch/mips/kernel/smp-cps.c arch/mips/loongson64/smp.c
On Tue, Feb 14, 2023 at 08:46:41AM +0100, Philippe Mathieu-Daudé wrote: > Hi Josh, > > On 14/2/23 08:05, Josh Poimboeuf wrote: > > Include <asm/smp.h> to make sure play_dead() matches its prototype going > > forward. > > > > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > > Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> > > --- > > arch/mips/kernel/smp-bmips.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c > > index f5d7bfa3472a..df9158e8329d 100644 > > --- a/arch/mips/kernel/smp-bmips.c > > +++ b/arch/mips/kernel/smp-bmips.c > > @@ -38,6 +38,7 @@ > > #include <asm/traps.h> > > #include <asm/barrier.h> > > #include <asm/cpu-features.h> > > +#include <asm/smp.h> > > What about the other implementations? > > $ git grep -L asm/smp.h $(git grep -wlF 'play_dead(void)' arch/mips) > arch/mips/cavium-octeon/smp.c > arch/mips/kernel/smp-bmips.c > arch/mips/kernel/smp-cps.c > arch/mips/loongson64/smp.c Indeed. I really wish we had -Wmissing-prototypes. I'll squash this in: diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 89954f5f87fb..4212584e6efa 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c @@ -20,6 +20,7 @@ #include <asm/mmu_context.h> #include <asm/time.h> #include <asm/setup.h> +#include <asm/smp.h> #include <asm/octeon/octeon.h> diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index bcd6a944b839..6d69a9ba8167 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c @@ -20,6 +20,7 @@ #include <asm/mipsregs.h> #include <asm/pm-cps.h> #include <asm/r4kcache.h> +#include <asm/smp.h> #include <asm/smp-cps.h> #include <asm/time.h> #include <asm/uasm.h> diff --git a/arch/mips/loongson64/smp.c b/arch/mips/loongson64/smp.c index c81c2bd07c62..df8d789ede3c 100644 --- a/arch/mips/loongson64/smp.c +++ b/arch/mips/loongson64/smp.c @@ -14,6 +14,7 @@ #include <linux/cpufreq.h> #include <linux/kexec.h> #include <asm/processor.h> +#include <asm/smp.h> #include <asm/time.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h>
On 14/2/23 19:11, Josh Poimboeuf wrote: > On Tue, Feb 14, 2023 at 08:46:41AM +0100, Philippe Mathieu-Daudé wrote: >> Hi Josh, >> >> On 14/2/23 08:05, Josh Poimboeuf wrote: >>> Include <asm/smp.h> to make sure play_dead() matches its prototype going >>> forward. >>> >>> Acked-by: Florian Fainelli <f.fainelli@gmail.com> >>> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> >>> --- >>> arch/mips/kernel/smp-bmips.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c >>> index f5d7bfa3472a..df9158e8329d 100644 >>> --- a/arch/mips/kernel/smp-bmips.c >>> +++ b/arch/mips/kernel/smp-bmips.c >>> @@ -38,6 +38,7 @@ >>> #include <asm/traps.h> >>> #include <asm/barrier.h> >>> #include <asm/cpu-features.h> >>> +#include <asm/smp.h> >> >> What about the other implementations? >> >> $ git grep -L asm/smp.h $(git grep -wlF 'play_dead(void)' arch/mips) >> arch/mips/cavium-octeon/smp.c >> arch/mips/kernel/smp-bmips.c >> arch/mips/kernel/smp-cps.c >> arch/mips/loongson64/smp.c > > Indeed. I really wish we had -Wmissing-prototypes. > > I'll squash this in: > > diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c > index 89954f5f87fb..4212584e6efa 100644 > --- a/arch/mips/cavium-octeon/smp.c > +++ b/arch/mips/cavium-octeon/smp.c > @@ -20,6 +20,7 @@ > #include <asm/mmu_context.h> > #include <asm/time.h> > #include <asm/setup.h> > +#include <asm/smp.h> > > #include <asm/octeon/octeon.h> > > diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c > index bcd6a944b839..6d69a9ba8167 100644 > --- a/arch/mips/kernel/smp-cps.c > +++ b/arch/mips/kernel/smp-cps.c > @@ -20,6 +20,7 @@ > #include <asm/mipsregs.h> > #include <asm/pm-cps.h> > #include <asm/r4kcache.h> > +#include <asm/smp.h> > #include <asm/smp-cps.h> > #include <asm/time.h> > #include <asm/uasm.h> > diff --git a/arch/mips/loongson64/smp.c b/arch/mips/loongson64/smp.c > index c81c2bd07c62..df8d789ede3c 100644 > --- a/arch/mips/loongson64/smp.c > +++ b/arch/mips/loongson64/smp.c > @@ -14,6 +14,7 @@ > #include <linux/cpufreq.h> > #include <linux/kexec.h> > #include <asm/processor.h> > +#include <asm/smp.h> > #include <asm/time.h> > #include <asm/tlbflush.h> > #include <asm/cacheflush.h> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Thanks.
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c index f5d7bfa3472a..df9158e8329d 100644 --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c @@ -38,6 +38,7 @@ #include <asm/traps.h> #include <asm/barrier.h> #include <asm/cpu-features.h> +#include <asm/smp.h> static int __maybe_unused max_cpus = 1;