[v2.1,09/24] mips/cpu: Expose play_dead()'s prototype definition
Commit Message
Include <asm/smp.h> to make sure play_dead() matches its prototype going
forward.
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/mips/cavium-octeon/smp.c | 1 +
arch/mips/kernel/smp-bmips.c | 1 +
arch/mips/kernel/smp-cps.c | 1 +
arch/mips/loongson64/smp.c | 1 +
4 files changed, 4 insertions(+)
Comments
On Thu, Feb 16, 2023 at 10:42:52AM -0800, 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>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
The latest version of this patch triggered a new kbuild warning which is
fixed by the below patch. If there are no objections I'll bundle it in
with the rest of the set for merging.
---8<---
Subject: [PATCH] mips/smp: Add CONFIG_SMP guard for raw_smp_processor_id()
Content-type: text/plain
Without CONFIG_SMP, raw_smp_processor_id() is not expected to be defined
by the arch.
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202302220755.HM8J8GOR-lkp@intel.com/
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/mips/include/asm/smp.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index 4eee29b7845c..cf992b8b1e46 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -25,6 +25,7 @@ extern cpumask_t cpu_sibling_map[];
extern cpumask_t cpu_core_map[];
extern cpumask_t cpu_foreign_map[];
+#ifdef CONFIG_SMP
static inline int raw_smp_processor_id(void)
{
#if defined(__VDSO__)
@@ -36,6 +37,7 @@ static inline int raw_smp_processor_id(void)
#endif
}
#define raw_smp_processor_id raw_smp_processor_id
+#endif
/* Map from cpu id to sequential logical cpu number. This will only
not be idempotent when cpus failed to come on-line. */
On 1/3/23 19:16, Josh Poimboeuf wrote:
> The latest version of this patch triggered a new kbuild warning which is
> fixed by the below patch. If there are no objections I'll bundle it in
> with the rest of the set for merging.
>
> ---8<---
>
> Subject: [PATCH] mips/smp: Add CONFIG_SMP guard for raw_smp_processor_id()
> Content-type: text/plain
>
> Without CONFIG_SMP, raw_smp_processor_id() is not expected to be defined
> by the arch.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Link: https://lore.kernel.org/oe-kbuild-all/202302220755.HM8J8GOR-lkp@intel.com/
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---
> arch/mips/include/asm/smp.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
> index 4eee29b7845c..cf992b8b1e46 100644
> --- a/arch/mips/include/asm/smp.h
> +++ b/arch/mips/include/asm/smp.h
> @@ -25,6 +25,7 @@ extern cpumask_t cpu_sibling_map[];
> extern cpumask_t cpu_core_map[];
> extern cpumask_t cpu_foreign_map[];
>
> +#ifdef CONFIG_SMP
> static inline int raw_smp_processor_id(void)
> {
> #if defined(__VDSO__)
> @@ -36,6 +37,7 @@ static inline int raw_smp_processor_id(void)
> #endif
> }
> #define raw_smp_processor_id raw_smp_processor_id
> +#endif
>
> /* Map from cpu id to sequential logical cpu number. This will only
> not be idempotent when cpus failed to come on-line. */
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
@@ -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>
@@ -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;
@@ -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>
@@ -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>