Index: kernel/arch/sparc64/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc64/include/arch/barrier.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
+++ kernel/arch/sparc64/include/arch/barrier.h	(revision 8c85f0f28eee89a731d082e5c3e87ae6d4d4ba98)
@@ -116,11 +116,5 @@
 #define FLUSH_INVAL_MIN  4
 
-#define smc_coherence(a) \
-	do { \
-		write_barrier(); \
-		flush((a)); \
-	} while (0)
-
-#define smc_coherence_block(a, l) \
+#define smc_coherence(a, l) \
 	do { \
 		unsigned long i; \
@@ -133,11 +127,5 @@
 #elif defined (US3)
 
-#define smc_coherence(a) \
-	do { \
-		write_barrier(); \
-		flush_pipeline(); \
-	} while (0)
-
-#define smc_coherence_block(a, l) \
+#define smc_coherence(a, l) \
 	do { \
 		write_barrier(); \