* [PATCH] MIPS: paravirt: Fix undefined reference to smp_bootstrap
@ 2016-09-05 14:43 Matt Redfearn
2016-09-13 14:49 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Matt Redfearn @ 2016-09-05 14:43 UTC (permalink / raw)
To: Ralf Baechle, linux-mips; +Cc: Matt Redfearn, linux-kernel
If the paravirt machine is compiles without CONFIG_SMP, the following
linker error occurs
arch/mips/kernel/head.o: In function `kernel_entry':
(.ref.text+0x10): undefined reference to `smp_bootstrap'
due to the kernel entry macro always including SMP startup code.
Wrap this code in CONFIG_SMP to fix the error.
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
---
arch/mips/include/asm/mach-paravirt/kernel-entry-init.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h b/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
index 2f82bfa3a773..c9f5769dfc8f 100644
--- a/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
@@ -11,11 +11,13 @@
#define CP0_EBASE $15, 1
.macro kernel_entry_setup
+#ifdef CONFIG_SMP
mfc0 t0, CP0_EBASE
andi t0, t0, 0x3ff # CPUNum
beqz t0, 1f
# CPUs other than zero goto smp_bootstrap
j smp_bootstrap
+#endif /* CONFIG_SMP */
1:
.endm
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] MIPS: paravirt: Fix undefined reference to smp_bootstrap
2016-09-05 14:43 [PATCH] MIPS: paravirt: Fix undefined reference to smp_bootstrap Matt Redfearn
@ 2016-09-13 14:49 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2016-09-13 14:49 UTC (permalink / raw)
To: Matt Redfearn; +Cc: linux-mips, linux-kernel, stable
On Mon, Sep 05, 2016 at 03:43:40PM +0100, Matt Redfearn wrote:
> If the paravirt machine is compiles without CONFIG_SMP, the following
> linker error occurs
>
> arch/mips/kernel/head.o: In function `kernel_entry':
> (.ref.text+0x10): undefined reference to `smp_bootstrap'
>
> due to the kernel entry macro always including SMP startup code.
> Wrap this code in CONFIG_SMP to fix the error.
>
> Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Thanks, applied. This patch should be applied to 3.16+ also so I've
added a Cc: stable... tag.
Ralf
> arch/mips/include/asm/mach-paravirt/kernel-entry-init.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h b/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
> index 2f82bfa3a773..c9f5769dfc8f 100644
> --- a/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
> +++ b/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h
> @@ -11,11 +11,13 @@
> #define CP0_EBASE $15, 1
>
> .macro kernel_entry_setup
> +#ifdef CONFIG_SMP
> mfc0 t0, CP0_EBASE
> andi t0, t0, 0x3ff # CPUNum
> beqz t0, 1f
> # CPUs other than zero goto smp_bootstrap
> j smp_bootstrap
> +#endif /* CONFIG_SMP */
>
> 1:
> .endm
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-13 14:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-05 14:43 [PATCH] MIPS: paravirt: Fix undefined reference to smp_bootstrap Matt Redfearn
2016-09-13 14:49 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).