diff --git a/[refs] b/[refs]
index 55b3a55b9451..bba5cfc59942 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71872b5fb2bed294fd5afd900890880e9faa82c1
+refs/heads/master: 599bf77a0d0b253dd94fd058275b05520c6d25db
diff --git a/trunk/arch/xtensa/include/asm/barrier.h b/trunk/arch/xtensa/include/asm/barrier.h
index 55707a8009d3..ef021677d536 100644
--- a/trunk/arch/xtensa/include/asm/barrier.h
+++ b/trunk/arch/xtensa/include/asm/barrier.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2012 Tensilica Inc.
  */
 
 #ifndef _XTENSA_SYSTEM_H
@@ -12,8 +12,8 @@
 #define smp_read_barrier_depends() do { } while(0)
 #define read_barrier_depends() do { } while(0)
 
-#define mb()  barrier()
-#define rmb() mb()
+#define mb()  ({ __asm__ __volatile__("memw" : : : "memory"); })
+#define rmb() barrier()
 #define wmb() mb()
 
 #ifdef CONFIG_SMP