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: (26 commits)
  arch/tile: prefer "tilepro" as the name of the 32-bit architecture
  compat: include aio_abi.h for aio_context_t
  arch/tile: cleanups for tilegx compat mode
  arch/tile: allocate PCI IRQs later in boot
  arch/tile: support signal "exception-trace" hook
  arch/tile: use better definitions of xchg() and cmpxchg()
  include/linux/compat.h: coding-style fixes
  tile: add an RTC driver for the Tilera hypervisor
  arch/tile: finish enabling support for TILE-Gx 64-bit chip
  compat: fixes to allow working with tile arch
  arch/tile: update defconfig file to something more useful
  tile: do_hardwall_trap: do not play with task->sighand
  tile: replace mm->cpu_vm_mask with mm_cpumask()
  tile,mn10300: add device parameter to dma_cache_sync()
  audit: support the "standard" <asm-generic/unistd.h>
  arch/tile: clarify flush_buffer()/finv_buffer() function names
  arch/tile: kernel-related cleanups from removing static page size
  arch/tile: various header improvements for building drivers
  arch/tile: disable GX prefetcher during cache flush
  arch/tile: tolerate disabling CONFIG_BLK_DEV_INITRD
  ...

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/net/tile/tilepro.c b/drivers/net/tile/tilepro.c
index 1e980fdd9d77..1e2af96fc29c 100644
--- a/drivers/net/tile/tilepro.c
+++ b/drivers/net/tile/tilepro.c
@@ -1658,11 +1658,9 @@ static int tile_net_stop(struct net_device *dev)
         while (tile_net_lepp_free_comps(dev, true))
                 /* loop */;
 
-        /* Wipe the EPP queue. */
+        /* Wipe the EPP queue, and wait till the stores hit the EPP. */
         memset(priv->eq, 0, sizeof(lepp_queue_t));
-
-        /* Evict the EPP queue. */
-        finv_buffer(priv->eq, EQ_SIZE);
+        mb();
 
         return 0;
 }
@@ -2398,7 +2396,7 @@ static void tile_net_cleanup(void)
                         struct net_device *dev = tile_net_devs[i];
                         struct tile_net_priv *priv = netdev_priv(dev);
                         unregister_netdev(dev);
-                        finv_buffer(priv->eq, EQ_SIZE);
+                        finv_buffer_remote(priv->eq, EQ_SIZE, 0);
                         __free_pages(priv->eq_pages, EQ_ORDER);
                         free_netdev(dev);
                 }