diff options
author | Qais Yousef <qais.yousef@imgtec.com> | 2015-12-08 08:20:29 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-02-25 04:56:58 -0500 |
commit | 7eb8c99db26cc6499bfb1eba72dffc4730570752 (patch) | |
tree | ab114e1b58a5c332fc783083672c23372ff96018 /arch/mips | |
parent | bb11cff327e54179c13446c4022ed4ed7d4871c7 (diff) |
MIPS: Delete smp-gic.c
We now have a generic IPI layer that will use GIC automatically
if it's compiled in.
Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: <jason@lakedaemon.net>
Cc: <marc.zyngier@arm.com>
Cc: <jiang.liu@linux.intel.com>
Cc: <linux-mips@linux-mips.org>
Cc: <lisa.parratt@imgtec.com>
Cc: Qais Yousef <qsyousef@gmail.com>
Link: http://lkml.kernel.org/r/1449580830-23652-19-git-send-email-qais.yousef@imgtec.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 6 | ||||
-rw-r--r-- | arch/mips/kernel/Makefile | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index eb079ac36dc8..ddcbeda501ae 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -2170,7 +2170,6 @@ config MIPS_MT_SMP | |||
2170 | select CPU_MIPSR2_IRQ_VI | 2170 | select CPU_MIPSR2_IRQ_VI |
2171 | select CPU_MIPSR2_IRQ_EI | 2171 | select CPU_MIPSR2_IRQ_EI |
2172 | select SYNC_R4K | 2172 | select SYNC_R4K |
2173 | select MIPS_GIC_IPI | ||
2174 | select MIPS_MT | 2173 | select MIPS_MT |
2175 | select SMP | 2174 | select SMP |
2176 | select SMP_UP | 2175 | select SMP_UP |
@@ -2268,7 +2267,6 @@ config MIPS_VPE_APSP_API_MT | |||
2268 | config MIPS_CMP | 2267 | config MIPS_CMP |
2269 | bool "MIPS CMP framework support (DEPRECATED)" | 2268 | bool "MIPS CMP framework support (DEPRECATED)" |
2270 | depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 | 2269 | depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 |
2271 | select MIPS_GIC_IPI | ||
2272 | select SMP | 2270 | select SMP |
2273 | select SYNC_R4K | 2271 | select SYNC_R4K |
2274 | select SYS_SUPPORTS_SMP | 2272 | select SYS_SUPPORTS_SMP |
@@ -2288,7 +2286,6 @@ config MIPS_CPS | |||
2288 | select MIPS_CM | 2286 | select MIPS_CM |
2289 | select MIPS_CPC | 2287 | select MIPS_CPC |
2290 | select MIPS_CPS_PM if HOTPLUG_CPU | 2288 | select MIPS_CPS_PM if HOTPLUG_CPU |
2291 | select MIPS_GIC_IPI | ||
2292 | select SMP | 2289 | select SMP |
2293 | select SYNC_R4K if (CEVT_R4K || CSRC_R4K) | 2290 | select SYNC_R4K if (CEVT_R4K || CSRC_R4K) |
2294 | select SYS_SUPPORTS_HOTPLUG_CPU | 2291 | select SYS_SUPPORTS_HOTPLUG_CPU |
@@ -2306,9 +2303,6 @@ config MIPS_CPS_PM | |||
2306 | select MIPS_CPC | 2303 | select MIPS_CPC |
2307 | bool | 2304 | bool |
2308 | 2305 | ||
2309 | config MIPS_GIC_IPI | ||
2310 | bool | ||
2311 | |||
2312 | config MIPS_CM | 2306 | config MIPS_CM |
2313 | bool | 2307 | bool |
2314 | 2308 | ||
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 68e2b7db9348..b0988fd62fcc 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -52,7 +52,6 @@ obj-$(CONFIG_MIPS_MT_SMP) += smp-mt.o | |||
52 | obj-$(CONFIG_MIPS_CMP) += smp-cmp.o | 52 | obj-$(CONFIG_MIPS_CMP) += smp-cmp.o |
53 | obj-$(CONFIG_MIPS_CPS) += smp-cps.o cps-vec.o | 53 | obj-$(CONFIG_MIPS_CPS) += smp-cps.o cps-vec.o |
54 | obj-$(CONFIG_MIPS_CPS_NS16550) += cps-vec-ns16550.o | 54 | obj-$(CONFIG_MIPS_CPS_NS16550) += cps-vec-ns16550.o |
55 | obj-$(CONFIG_MIPS_GIC_IPI) += smp-gic.o | ||
56 | obj-$(CONFIG_MIPS_SPRAM) += spram.o | 55 | obj-$(CONFIG_MIPS_SPRAM) += spram.o |
57 | 56 | ||
58 | obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o | 57 | obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o |