From edb6f633cd30f1aa9b23463976246886a4d25a68 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Thu, 14 Oct 2010 15:12:55 -0400
Subject: [PATCH] --- yaml --- r: 217612 b: refs/heads/master c:
 13c9d5a6309763a494f7c3ed5aa45fb473985fd7 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/tile/include/asm/system.h | 5 ++++-
 trunk/arch/tile/lib/exports.c        | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6dfa18462f0e..e3167baf2aa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbacff94d0c38163ef01361de006797c92e69e58
+refs/heads/master: 13c9d5a6309763a494f7c3ed5aa45fb473985fd7
diff --git a/trunk/arch/tile/include/asm/system.h b/trunk/arch/tile/include/asm/system.h
index f749be327ce0..96779c805902 100644
--- a/trunk/arch/tile/include/asm/system.h
+++ b/trunk/arch/tile/include/asm/system.h
@@ -89,6 +89,10 @@
 #define get_cycles_low() __insn_mfspr(SPR_CYCLE)   /* just get all 64 bits */
 #endif
 
+#if !CHIP_HAS_MF_WAITS_FOR_VICTIMS()
+int __mb_incoherent(void);  /* Helper routine for mb_incoherent(). */
+#endif
+
 /* Fence to guarantee visibility of stores to incoherent memory. */
 static inline void
 mb_incoherent(void)
@@ -97,7 +101,6 @@ mb_incoherent(void)
 
 #if !CHIP_HAS_MF_WAITS_FOR_VICTIMS()
 	{
-		int __mb_incoherent(void);
 #if CHIP_HAS_TILE_WRITE_PENDING()
 		const unsigned long WRITE_TIMEOUT_CYCLES = 400;
 		unsigned long start = get_cycles_low();
diff --git a/trunk/arch/tile/lib/exports.c b/trunk/arch/tile/lib/exports.c
index ce5dbf56578f..1509c5597653 100644
--- a/trunk/arch/tile/lib/exports.c
+++ b/trunk/arch/tile/lib/exports.c
@@ -45,6 +45,9 @@ EXPORT_SYMBOL(__copy_from_user_zeroing);
 EXPORT_SYMBOL(__copy_in_user_inatomic);
 #endif
 
+/* arch/tile/lib/mb_incoherent.S */
+EXPORT_SYMBOL(__mb_incoherent);
+
 /* hypervisor glue */
 #include <hv/hypervisor.h>
 EXPORT_SYMBOL(hv_dev_open);