Merge branch '3.14-fixes' into mips-for-linux-next

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/bcm47xx/board.c
Simple merge

diff --cc arch/mips/include/asm/asmmacro.h
Simple merge

diff --cc arch/mips/include/asm/fpu.h
Simple merge

diff --cc arch/mips/include/asm/syscall.h
index 9031745cec1bbb5bfed5caa9012afb5ffcdcf64d,f35b131977e62a3ef0d81c47da6827f47d527b71..6c488c85d79141b385d1d6c0c394aa4400518fbf
--- 1/arch/mips/include/asm/syscall.h
--- 2/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@@ -100,18 -86,10 +103,17 @@@ static inline void syscall_get_argument
                                         unsigned int i, unsigned int n,
                                         unsigned long *args)
  {
-       unsigned long arg;
        int ret;
 +      /* O32 ABI syscall() - Either 64-bit with O32 or 32-bit */
 +      if ((config_enabled(CONFIG_32BIT) ||
 +          test_tsk_thread_flag(task, TIF_32BIT_REGS)) &&
 +          (regs->regs[2] == __NR_syscall)) {
 +              i++;
 +              n++;
 +      }
  
        while (n--)
-               ret |= mips_get_syscall_arg(&arg, task, regs, i++);
+               ret |= mips_get_syscall_arg(args++, task, regs, i++);
  
        /*
         * No way to communicate an error because this is a void function.

diff --cc arch/mips/include/uapi/asm/inst.h
Simple merge

diff --cc arch/mips/kernel/ftrace.c
Simple merge

diff --cc arch/mips/kernel/r4k_fpu.S
Simple merge

diff --cc arch/mips/math-emu/cp1emu.c
Simple merge

diff --cc arch/mips/mti-malta/malta-int.c
index c6cbfebcac9b04b8b4c54e8b4d9b7d527a56b86e,2242181a62841e2c86cd87ab3859bee35ca91099..b71ee809191a2f3beaf8734b727decb634a39bdf
--- 1/arch/mips/mti-malta/malta-int.c
--- 2/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@@ -302,16 -308,9 +302,16 @@@ static void ipi_call_dispatch(void
        do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_CALL_IRQ);
  }
  
 +#endif /* CONFIG_MIPS_MT_SMP */
 +
 +#ifdef CONFIG_MIPS_GIC_IPI
 +
 +#define GIC_MIPS_CPU_IPI_RESCHED_IRQ  3
 +#define GIC_MIPS_CPU_IPI_CALL_IRQ     4
 +
  static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id)
  {
- #ifdef MIPS_VPE_APSP_API
+ #ifdef CONFIG_MIPS_VPE_APSP_API_CMP
        if (aprp_hook)
                aprp_hook();
  #endif