Index: kernel/arch/sparc64/include/barrier.h
===================================================================
--- kernel/arch/sparc64/include/barrier.h	(revision e25eca8008c4df6f190fbd28a399c5e01406f863)
+++ kernel/arch/sparc64/include/barrier.h	(revision 1e1e5e1f552946adaf5576371c0d6cd57ecfd5a9)
@@ -58,8 +58,6 @@
 	asm volatile ("membar #StoreStore\n" ::: "memory")
 
-static inline void flush(uintptr_t addr)
-{
-	asm volatile ("flush %0\n" :: "r" (addr) : "memory");
-}
+#define flush(a)		\
+	asm volatile ("flush %0\n" :: "r" ((a)) : "memory")
 
 /** Flush Instruction Memory instruction. */
@@ -91,4 +89,13 @@
 }
 
+#define FLUSH_INVAL_MIN		4
+#define smc_coherence_block(a, l)			\
+{							\
+	unsigned long i;				\
+	write_barrier();				\
+	for (i = 0; i < (l); i += FLUSH_INVAL_MIN)	\
+		flush((void *)(a) + i);			\
+}
+
 #endif