diff options
| -rw-r--r-- | arch/arm/include/asm/system.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-realview/include/mach/barriers.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/barriers.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 885be097769d..832888d0c20c 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h | |||
| @@ -159,7 +159,7 @@ extern unsigned int user_debug; | |||
| 159 | #include <mach/barriers.h> | 159 | #include <mach/barriers.h> |
| 160 | #elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP) | 160 | #elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP) |
| 161 | #define mb() do { dsb(); outer_sync(); } while (0) | 161 | #define mb() do { dsb(); outer_sync(); } while (0) |
| 162 | #define rmb() dmb() | 162 | #define rmb() dsb() |
| 163 | #define wmb() mb() | 163 | #define wmb() mb() |
| 164 | #else | 164 | #else |
| 165 | #include <asm/memory.h> | 165 | #include <asm/memory.h> |
diff --git a/arch/arm/mach-realview/include/mach/barriers.h b/arch/arm/mach-realview/include/mach/barriers.h index 0c5d749d7b5f..9a732195aa1c 100644 --- a/arch/arm/mach-realview/include/mach/barriers.h +++ b/arch/arm/mach-realview/include/mach/barriers.h | |||
| @@ -4,5 +4,5 @@ | |||
| 4 | * operation to deadlock the system. | 4 | * operation to deadlock the system. |
| 5 | */ | 5 | */ |
| 6 | #define mb() dsb() | 6 | #define mb() dsb() |
| 7 | #define rmb() dmb() | 7 | #define rmb() dsb() |
| 8 | #define wmb() mb() | 8 | #define wmb() mb() |
diff --git a/arch/arm/mach-tegra/include/mach/barriers.h b/arch/arm/mach-tegra/include/mach/barriers.h index cc115174899b..425b42e91ef6 100644 --- a/arch/arm/mach-tegra/include/mach/barriers.h +++ b/arch/arm/mach-tegra/include/mach/barriers.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <asm/outercache.h> | 24 | #include <asm/outercache.h> |
| 25 | 25 | ||
| 26 | #define rmb() dmb() | 26 | #define rmb() dsb() |
| 27 | #define wmb() do { dsb(); outer_sync(); } while (0) | 27 | #define wmb() do { dsb(); outer_sync(); } while (0) |
| 28 | #define mb() wmb() | 28 | #define mb() wmb() |
| 29 | 29 | ||
