| Message ID | 1393422280-22283-2-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed, Feb 26, 2014 at 09:44:38PM +0800, Shawn Guo wrote: > diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S > index e4b9fed..6e1a56d 100644 > --- a/arch/arm/mach-imx/headsmp.S > +++ b/arch/arm/mach-imx/headsmp.S > @@ -15,7 +15,6 @@ > > .section ".text.head", "ax" While you're here, can you please fix the above section name. I think a .text will do just fine here.
On Wed, Feb 26, 2014 at 09:00:57PM +0000, Russell King - ARM Linux wrote: > On Wed, Feb 26, 2014 at 09:44:38PM +0800, Shawn Guo wrote: > > diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S > > index e4b9fed..6e1a56d 100644 > > --- a/arch/arm/mach-imx/headsmp.S > > +++ b/arch/arm/mach-imx/headsmp.S > > @@ -15,7 +15,6 @@ > > > > .section ".text.head", "ax" > > While you're here, can you please fix the above section name. I think > a .text will do just fine here. Indeed. I will post a patch for it shortly. Shawn
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index b4c19cd..9c776a0 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -104,9 +104,9 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a obj-$(CONFIG_SUSPEND) += suspend-imx6.o -obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o # i.MX6SL reuses i.MX6Q code -obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o +obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o # i.MX5 based machines obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S index e4b9fed..6e1a56d 100644 --- a/arch/arm/mach-imx/headsmp.S +++ b/arch/arm/mach-imx/headsmp.S @@ -15,7 +15,6 @@ .section ".text.head", "ax" -#ifdef CONFIG_SMP diag_reg_offset: .word g_diag_reg - . @@ -32,4 +31,3 @@ ENTRY(v7_secondary_startup) set_diag_reg b secondary_startup ENDPROC(v7_secondary_startup) -#endif
With v7_cpu_resume() being moved out of headsmp.S, all the remaining code in the file is only needed by CONFIG_SMP build. So we can control the build of headsmp.o with only obj-$(CONFIG_SMP) now. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- arch/arm/mach-imx/Makefile | 4 ++-- arch/arm/mach-imx/headsmp.S | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)