aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-03-06 16:28:56 -0500
committerRalf Baechle <ralf@linux-mips.org>2016-03-13 05:56:48 -0400
commit7a50e4688dabb8005df39b2b992d76629b8af8aa (patch)
tree460bf393f149c238be5b3caf1a62a72f90ed8351
parent4b7b1ef2c2f83d702272555e8adb839a50ba0f8e (diff)
MIPS: Fix build error when SMP is used without GIC
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 from 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 already protected by some #ifdefs The first part of this was introduced in commit 72e20142b2bf ("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+ Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12774/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/Kconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 74a3db92da1b..d3da79dda629 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2169,7 +2169,7 @@ config MIPS_MT_SMP
2169 select CPU_MIPSR2_IRQ_VI 2169 select CPU_MIPSR2_IRQ_VI
2170 select CPU_MIPSR2_IRQ_EI 2170 select CPU_MIPSR2_IRQ_EI
2171 select SYNC_R4K 2171 select SYNC_R4K
2172 select MIPS_GIC_IPI 2172 select MIPS_GIC_IPI if MIPS_GIC
2173 select MIPS_MT 2173 select MIPS_MT
2174 select SMP 2174 select SMP
2175 select SMP_UP 2175 select SMP_UP
@@ -2267,7 +2267,7 @@ config MIPS_VPE_APSP_API_MT
2267config MIPS_CMP 2267config MIPS_CMP
2268 bool "MIPS CMP framework support (DEPRECATED)" 2268 bool "MIPS CMP framework support (DEPRECATED)"
2269 depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 2269 depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
2270 select MIPS_GIC_IPI 2270 select MIPS_GIC_IPI if MIPS_GIC
2271 select SMP 2271 select SMP
2272 select SYNC_R4K 2272 select SYNC_R4K
2273 select SYS_SUPPORTS_SMP 2273 select SYS_SUPPORTS_SMP
@@ -2287,7 +2287,7 @@ config MIPS_CPS
2287 select MIPS_CM 2287 select MIPS_CM
2288 select MIPS_CPC 2288 select MIPS_CPC
2289 select MIPS_CPS_PM if HOTPLUG_CPU 2289 select MIPS_CPS_PM if HOTPLUG_CPU
2290 select MIPS_GIC_IPI 2290 select MIPS_GIC_IPI if MIPS_GIC
2291 select SMP 2291 select SMP
2292 select SYNC_R4K if (CEVT_R4K || CSRC_R4K) 2292 select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
2293 select SYS_SUPPORTS_HOTPLUG_CPU 2293 select SYS_SUPPORTS_HOTPLUG_CPU
@@ -2306,6 +2306,7 @@ config MIPS_CPS_PM
2306 bool 2306 bool
2307 2307
2308config MIPS_GIC_IPI 2308config MIPS_GIC_IPI
2309 depends on MIPS_GIC
2309 bool 2310 bool
2310 2311
2311config MIPS_CM 2312config MIPS_CM