summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2012-11-24 06:22:08 +0400
committerChris Zankel <chris@zankel.net>2012-12-18 21:10:23 -0800
commit599bf77a0d0b253dd94fd058275b05520c6d25db (patch)
tree4b6a0ae21bf0188adbe2a0f25ad2ac81a7d53af1 /arch/xtensa
parent71872b5fb2bed294fd5afd900890880e9faa82c1 (diff)
downloadop-kernel-dev-599bf77a0d0b253dd94fd058275b05520c6d25db.zip
op-kernel-dev-599bf77a0d0b253dd94fd058275b05520c6d25db.tar.gz
xtensa: fix mb and wmb definitions
Define mb and wmb as memw to force memory barrier. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/include/asm/barrier.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/barrier.h b/arch/xtensa/include/asm/barrier.h
index 55707a8..ef02167 100644
--- a/arch/xtensa/include/asm/barrier.h
+++ b/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
OpenPOWER on IntegriCloud