Index: kernel/arch/sparc64/include/arch/barrier.h
===================================================================
--- kernel/arch/sparc64/include/arch/barrier.h	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
+++ kernel/arch/sparc64/include/arch/barrier.h	(revision ffa73c60dc2eba8ce632c52a0be8bbf4ecd562d9)
@@ -38,45 +38,4 @@
 #include <trace.h>
 
-/*
- * Our critical section barriers are prepared for the weakest RMO memory model.
- */
-#define CS_ENTER_BARRIER() \
-	asm volatile ( \
-		"membar #LoadLoad | #LoadStore\n" \
-		::: "memory" \
-	)
-
-#define CS_LEAVE_BARRIER() \
-	asm volatile ( \
-		"membar #StoreStore\n" \
-		"membar #LoadStore\n" \
-		::: "memory" \
-	)
-
-#define memory_barrier() \
-	asm volatile ( \
-		"membar #LoadLoad | #StoreStore\n" \
-		::: "memory" \
-	)
-
-#define read_barrier() \
-	asm volatile ( \
-		"membar #LoadLoad\n" \
-		::: "memory" \
-	)
-
-#define write_barrier() \
-	asm volatile ( \
-		"membar #StoreStore\n" \
-		::: "memory" \
-	)
-
-#define flush(a) \
-	asm volatile ( \
-		"flush %[reg]\n" \
-		:: [reg] "r" ((a)) \
-		: "memory" \
-	)
-
 /** Flush Instruction pipeline. */
 NO_TRACE static inline void flush_pipeline(void)
@@ -110,31 +69,4 @@
 }
 
-#ifdef KERNEL
-
-#if defined(US)
-
-#define FLUSH_INVAL_MIN  4
-
-#define smc_coherence(a, l) \
-	do { \
-		unsigned long i; \
-		write_barrier(); \
-		\
-		for (i = 0; i < (l); i += FLUSH_INVAL_MIN) \
-			flush((void *)(a) + i); \
-	} while (0)
-
-#elif defined (US3)
-
-#define smc_coherence(a, l) \
-	do { \
-		write_barrier(); \
-		flush_pipeline(); \
-	} while (0)
-
-#endif  /* defined(US3) */
-
-#endif	/* KERNEL */
-
 #endif
 
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision ffa73c60dc2eba8ce632c52a0be8bbf4ecd562d9)
@@ -98,4 +98,5 @@
 #include <arch/mm/page.h>
 #include <arch/asm.h>
+#include <arch/barrier.h>
 #include <barrier.h>
 #include <typedefs.h>