Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next

2 files changed, 3 insertions, 18 deletions

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index fdaf65e1a99d..ab51dc99c03f 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -34,28 +34,11 @@ obj-$(CONFIG_MODULES)		+= mips_ksyms.o module.o
 
 obj-$(CONFIG_FUNCTION_TRACER)   += mcount.o ftrace.o
 
-obj-$(CONFIG_CPU_LOONGSON2)     += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_MIPS32)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_MIPS64)        += r4k_fpu.o r4k_switch.o
+obj-$(CONFIG_CPU_R4K_FPU)       += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R3000)         += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_R4300)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R4X00)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5000)         += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R6000)         += r6000_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5432)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R5500)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R8000)         += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_RM7000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_RM9000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_NEVADA)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_R10000)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_SB1)           += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_TX39XX)        += r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_TX49XX)        += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_VR41XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o
-obj-$(CONFIG_CPU_XLR)           += r4k_fpu.o r4k_switch.o
-obj-$(CONFIG_CPU_XLP)           += r4k_fpu.o r4k_switch.o
 
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_SMP_UP)            += smp-up.o
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index ff17868734cf..2defa2bbdaa7 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -150,6 +150,7 @@ static void vsmp_send_ipi_mask(const struct cpumask *mask, unsigned int action)
 
 static void __cpuinit vsmp_init_secondary(void)
 {
+#ifdef CONFIG_IRQ_GIC
         extern int gic_present;
 
         /* This is Malta specific: IPI,performance and timer interrupts */
@@ -157,6 +158,7 @@ static void __cpuinit vsmp_init_secondary(void)
                 change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |
                                          STATUSF_IP6 | STATUSF_IP7);
         else
+#endif
                 change_c0_status(ST0_IM, STATUSF_IP0 | STATUSF_IP1 |
                                          STATUSF_IP6 | STATUSF_IP7);
 }