Merge tag 'arc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC changes from Vineet Gupta:
 - IPI optimization and cleanups
 - Support for bootloader provided external Device Tree blobs

* tag 'arc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [cmdline] support External Device Trees from u-boot
  ARC: [cmdline] uboot cmdline handling rework
  ARC: [SMP] optimize IPI send and receive
  ARC: [SMP] simplify IPI code
  ARC: [SMP] cpu halt interface doesn't need "self" cpu-id
  ARC: [SMP] IPI ACK interface doesn't need "self" cpu-id
  ARC: [SMP] cpumask not needed in IPI send path

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arc/include/asm/smp.h b/arch/arc/include/asm/smp.h
index eefc29f08cdb..5d06eee43ea9 100644
--- a/arch/arc/include/asm/smp.h
+++ b/arch/arc/include/asm/smp.h
@@ -46,14 +46,14 @@ extern int smp_ipi_irq_setup(int cpu, int irq);
  *
  * @info:               SoC SMP specific info for /proc/cpuinfo etc
  * @cpu_kick:           For Master to kickstart a cpu (optionally at a PC)
- * @ipi_send:           To send IPI to a @cpumask
- * @ips_clear:          To clear IPI received by @cpu at @irq
+ * @ipi_send:           To send IPI to a @cpu
+ * @ips_clear:          To clear IPI received at @irq
  */
 struct plat_smp_ops {
         const char      *info;
         void            (*cpu_kick)(int cpu, unsigned long pc);
-        void            (*ipi_send)(void *callmap);
-        void            (*ipi_clear)(int cpu, int irq);
+        void            (*ipi_send)(int cpu);
+        void            (*ipi_clear)(int irq);
 };
 
 /* TBD: stop exporting it for direct population by platform */