From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 31 Mar 2014 16:17:33 +0000 (+0200)
Subject: Merge branch '3.14-fixes' into mips-for-linux-next
X-Git-Tag: v3.15-rc1~125^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ade63aada79c61bcd5f51cbd310f237399892268;p=linux.git

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

ade63aada79c61bcd5f51cbd310f237399892268
diff --cc arch/mips/include/asm/syscall.h
index 9031745cec1b,f35b131977e6..6c488c85d791
--- a/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/mti-malta/malta-int.c
index c6cbfebcac9b,2242181a6284..b71ee809191a
--- a/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