diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/barrier.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h index 3d69aa829a76..2b8bbbcb9be0 100644 --- a/arch/mips/include/asm/barrier.h +++ b/arch/mips/include/asm/barrier.h | |||
@@ -75,20 +75,21 @@ | |||
75 | 75 | ||
76 | #include <asm/wbflush.h> | 76 | #include <asm/wbflush.h> |
77 | 77 | ||
78 | #define wmb() fast_wmb() | ||
79 | #define rmb() fast_rmb() | ||
80 | #define mb() wbflush() | 78 | #define mb() wbflush() |
81 | #define iob() wbflush() | 79 | #define iob() wbflush() |
82 | 80 | ||
83 | #else /* !CONFIG_CPU_HAS_WB */ | 81 | #else /* !CONFIG_CPU_HAS_WB */ |
84 | 82 | ||
85 | #define wmb() fast_wmb() | ||
86 | #define rmb() fast_rmb() | ||
87 | #define mb() fast_mb() | 83 | #define mb() fast_mb() |
88 | #define iob() fast_iob() | 84 | #define iob() fast_iob() |
89 | 85 | ||
90 | #endif /* !CONFIG_CPU_HAS_WB */ | 86 | #endif /* !CONFIG_CPU_HAS_WB */ |
91 | 87 | ||
88 | #define wmb() fast_wmb() | ||
89 | #define rmb() fast_rmb() | ||
90 | #define dma_wmb() fast_wmb() | ||
91 | #define dma_rmb() fast_rmb() | ||
92 | |||
92 | #if defined(CONFIG_WEAK_ORDERING) && defined(CONFIG_SMP) | 93 | #if defined(CONFIG_WEAK_ORDERING) && defined(CONFIG_SMP) |
93 | # ifdef CONFIG_CPU_CAVIUM_OCTEON | 94 | # ifdef CONFIG_CPU_CAVIUM_OCTEON |
94 | # define smp_mb() __sync() | 95 | # define smp_mb() __sync() |