Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (27 commits)
  arch/tile: support newer binutils assembler shift semantics
  arch/tile: fix deadlock bugs in rwlock implementation
  drivers/edac: provide support for tile architecture
  tile on-chip network driver: sync up with latest fixes
  arch/tile: support 4KB page size as well as 64KB
  arch/tile: add some more VMSPLIT options and use consistent naming
  arch/tile: fix some comments and whitespace
  arch/tile: export some additional module symbols
  arch/tile: enhance existing finv_buffer_remote() routine
  arch/tile: fix two bugs in the backtracer code
  arch/tile: use extended assembly to inline __mb_incoherent()
  arch/tile: use a cleaner technique to enable interrupt for cpu_idle()
  arch/tile: sync up with <arch/sim.h> and <arch/sim_def.h> changes
  arch/tile: fix reversed test of strict_strtol() return value
  arch/tile: avoid a simulator warning during bootup
  arch/tile: export <asm/hardwall.h> to userspace
  arch/tile: warn and retry if an IPI is not accepted by the target cpu
  arch/tile: stop disabling INTCTRL_1 interrupts during hypervisor downcalls
  arch/tile: fix __ndelay etc to work better
  arch/tile: bug fix: exec'ed task thought it was still single-stepping
  ...

Fix up trivial conflict in arch/tile/kernel/vmlinux.lds.S (percpu
alignment vs section naming convention fix)

1 files changed, 19 insertions, 14 deletions

diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c
index 9575b37a8b75..a4293102ef81 100644
--- a/arch/tile/kernel/smp.c
+++ b/arch/tile/kernel/smp.c
@@ -36,6 +36,22 @@ static unsigned long __iomem *ipi_mappings[NR_CPUS];
 /* Set by smp_send_stop() to avoid recursive panics. */
 static int stopping_cpus;
 
+static void __send_IPI_many(HV_Recipient *recip, int nrecip, int tag)
+{
+        int sent = 0;
+        while (sent < nrecip) {
+                int rc = hv_send_message(recip, nrecip,
+                                         (HV_VirtAddr)&tag, sizeof(tag));
+                if (rc < 0) {
+                        if (!stopping_cpus)  /* avoid recursive panic */
+                                panic("hv_send_message returned %d", rc);
+                        break;
+                }
+                WARN_ONCE(rc == 0, "hv_send_message() returned zero\n");
+                sent += rc;
+        }
+}
+
 void send_IPI_single(int cpu, int tag)
 {
         HV_Recipient recip = {
@@ -43,14 +59,13 @@ void send_IPI_single(int cpu, int tag)
                 .x = cpu % smp_width,
                 .state = HV_TO_BE_SENT
         };
-        int rc = hv_send_message(&recip, 1, (HV_VirtAddr)&tag, sizeof(tag));
-        BUG_ON(rc <= 0);
+        __send_IPI_many(&recip, 1, tag);
 }
 
 void send_IPI_many(const struct cpumask *mask, int tag)
 {
         HV_Recipient recip[NR_CPUS];
-        int cpu, sent;
+        int cpu;
         int nrecip = 0;
         int my_cpu = smp_processor_id();
         for_each_cpu(cpu, mask) {
@@ -61,17 +76,7 @@ void send_IPI_many(const struct cpumask *mask, int tag)
                 r->x = cpu % smp_width;
                 r->state = HV_TO_BE_SENT;
         }
-        sent = 0;
-        while (sent < nrecip) {
-                int rc = hv_send_message(recip, nrecip,
-                                         (HV_VirtAddr)&tag, sizeof(tag));
-                if (rc <= 0) {
-                        if (!stopping_cpus)  /* avoid recursive panic */
-                                panic("hv_send_message returned %d", rc);
-                        break;
-                }
-                sent += rc;
-        }
+        __send_IPI_many(recip, nrecip, tag);
 }
 
 void send_IPI_allbutself(int tag)