stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MIPS: fix build error when SMP is used without GIC
@ 2016-03-06 14:15 Hauke Mehrtens
  2016-03-06 20:22 ` Sergei Shtylyov
  0 siblings, 1 reply; 2+ messages in thread
From: Hauke Mehrtens @ 2016-03-06 14:15 UTC (permalink / raw)
  To: linux-mips, ralf; +Cc: Hauke Mehrtens, Paul Burton, # v3 . 15+

The MIPS_GIC_IPI should only be selected when MIPS_GIC is also
selected, otherwise it results in a compile error. smp-gic.c uses some
functions form include/linux/irqchip/mips-gic.h like
plat_ipi_call_int_xlate() which are only added to the header file when
MIPS_GIC is set. The Lantiq SoC does not use the GIC, but supports SMP.
The calls top the functions from smp-gic.c are laready protected by
some #ifdefs

The first part of this was introduced in commit 72e20142b "MIPS: Move
GIC IPI functions out of smp-cmp.c"

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: <stable@vger.kernel.org> # v3.15+
---
 arch/mips/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 74a3db9..d3da79d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2169,7 +2169,7 @@ config MIPS_MT_SMP
 	select CPU_MIPSR2_IRQ_VI
 	select CPU_MIPSR2_IRQ_EI
 	select SYNC_R4K
-	select MIPS_GIC_IPI
+	select MIPS_GIC_IPI if MIPS_GIC
 	select MIPS_MT
 	select SMP
 	select SMP_UP
@@ -2267,7 +2267,7 @@ config MIPS_VPE_APSP_API_MT
 config MIPS_CMP
 	bool "MIPS CMP framework support (DEPRECATED)"
 	depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
-	select MIPS_GIC_IPI
+	select MIPS_GIC_IPI if MIPS_GIC
 	select SMP
 	select SYNC_R4K
 	select SYS_SUPPORTS_SMP
@@ -2287,7 +2287,7 @@ config MIPS_CPS
 	select MIPS_CM
 	select MIPS_CPC
 	select MIPS_CPS_PM if HOTPLUG_CPU
-	select MIPS_GIC_IPI
+	select MIPS_GIC_IPI if MIPS_GIC
 	select SMP
 	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
 	select SYS_SUPPORTS_HOTPLUG_CPU
@@ -2306,6 +2306,7 @@ config MIPS_CPS_PM
 	bool
 
 config MIPS_GIC_IPI
+	depends on MIPS_GIC
 	bool
 
 config MIPS_CM
-- 
2.7.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] MIPS: fix build error when SMP is used without GIC
  2016-03-06 14:15 [PATCH] MIPS: fix build error when SMP is used without GIC Hauke Mehrtens
@ 2016-03-06 20:22 ` Sergei Shtylyov
  0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2016-03-06 20:22 UTC (permalink / raw)
  To: Hauke Mehrtens, linux-mips, ralf; +Cc: Paul Burton, # v3 . 15+

Hello.

On 03/06/2016 05:15 PM, Hauke Mehrtens wrote:

> The MIPS_GIC_IPI should only be selected when MIPS_GIC is also
> selected, otherwise it results in a compile error. smp-gic.c uses some
> functions form include/linux/irqchip/mips-gic.h like

   s/form/from/.

> plat_ipi_call_int_xlate() which are only added to the header file when
> MIPS_GIC is set. The Lantiq SoC does not use the GIC, but supports SMP.
> The calls top the functions from smp-gic.c are laready protected by

    s/laready/already/.

> some #ifdefs
>
> The first part of this was introduced in commit 72e20142b "MIPS: Move
> GIC IPI functions out of smp-cmp.c"

    scripts/checkpatch.pl now enforces certain commit citing style, yours 
doesn't quite match it...

> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: <stable@vger.kernel.org> # v3.15+

[...]

MBR, Sergei


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-06 20:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-06 14:15 [PATCH] MIPS: fix build error when SMP is used without GIC Hauke Mehrtens
2016-03-06 20:22 ` Sergei Shtylyov

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).