diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:20 +0200 |
commit | 3856aa0c642dc34af7939e30f93e81eefbe0b935 (patch) | |
tree | e55e69097c7f3186e38dc1d3b3d4a05f4e68b1e2 /include/asm-frv/system.h | |
parent | aaaf92ba88d5a2664185ba20fd34308c8581d59f (diff) | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Merge branch 'linus' into x86/cpatip-x86-cpa-2008-05-17-15-12-20
Diffstat (limited to 'include/asm-frv/system.h')
-rw-r--r-- | include/asm-frv/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h index cb307f8a6b48..d3a12a9079f7 100644 --- a/include/asm-frv/system.h +++ b/include/asm-frv/system.h @@ -179,7 +179,7 @@ do { \ #define mb() asm volatile ("membar" : : :"memory") #define rmb() asm volatile ("membar" : : :"memory") #define wmb() asm volatile ("membar" : : :"memory") -#define read_barrier_depends() barrier() +#define read_barrier_depends() do { } while (0) #ifdef CONFIG_SMP #define smp_mb() mb() |