Commit 588bad2e authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Greg Kroah-Hartman

MIPS: Fix build error when SMP is used without GIC

commit 7a50e468 upstream.

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 72e20142 ("MIPS:
Move GIC IPI functions out of smp-cmp.c")
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12774/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f639e2e
...@@ -2155,7 +2155,7 @@ config MIPS_MT_SMP ...@@ -2155,7 +2155,7 @@ config MIPS_MT_SMP
select CPU_MIPSR2_IRQ_VI select CPU_MIPSR2_IRQ_VI
select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_EI
select SYNC_R4K select SYNC_R4K
select MIPS_GIC_IPI select MIPS_GIC_IPI if MIPS_GIC
select MIPS_MT select MIPS_MT
select SMP select SMP
select SMP_UP select SMP_UP
...@@ -2253,7 +2253,7 @@ config MIPS_VPE_APSP_API_MT ...@@ -2253,7 +2253,7 @@ config MIPS_VPE_APSP_API_MT
config MIPS_CMP config MIPS_CMP
bool "MIPS CMP framework support (DEPRECATED)" bool "MIPS CMP framework support (DEPRECATED)"
depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
select MIPS_GIC_IPI select MIPS_GIC_IPI if MIPS_GIC
select SMP select SMP
select SYNC_R4K select SYNC_R4K
select SYS_SUPPORTS_SMP select SYS_SUPPORTS_SMP
...@@ -2273,7 +2273,7 @@ config MIPS_CPS ...@@ -2273,7 +2273,7 @@ config MIPS_CPS
select MIPS_CM select MIPS_CM
select MIPS_CPC select MIPS_CPC
select MIPS_CPS_PM if HOTPLUG_CPU select MIPS_CPS_PM if HOTPLUG_CPU
select MIPS_GIC_IPI select MIPS_GIC_IPI if MIPS_GIC
select SMP select SMP
select SYNC_R4K if (CEVT_R4K || CSRC_R4K) select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
select SYS_SUPPORTS_HOTPLUG_CPU select SYS_SUPPORTS_HOTPLUG_CPU
...@@ -2292,6 +2292,7 @@ config MIPS_CPS_PM ...@@ -2292,6 +2292,7 @@ config MIPS_CPS_PM
bool bool
config MIPS_GIC_IPI config MIPS_GIC_IPI
depends on MIPS_GIC
bool bool
config MIPS_CM config MIPS_CM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment