From d91c329bfa8d1e5a285a1ec0c099b886f92d3cba Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Sat, 13 Oct 2007 03:07:38 +0200 Subject: [PATCH] --- yaml --- r: 68172 b: refs/heads/master c: b6c7347fffa655a3000d9d41640d222c19fc3065 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/system_32.h | 6 +++++- trunk/include/asm-x86/system_64.h | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b10e4576e86..3f15d99e8c4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4071c718555d955a35e9651f77086096ad87d498 +refs/heads/master: b6c7347fffa655a3000d9d41640d222c19fc3065 diff --git a/trunk/include/asm-x86/system_32.h b/trunk/include/asm-x86/system_32.h index 8b15bd3057c9..e7e5d426fef5 100644 --- a/trunk/include/asm-x86/system_32.h +++ b/trunk/include/asm-x86/system_32.h @@ -274,7 +274,11 @@ static inline unsigned long get_limit(unsigned long segment) #ifdef CONFIG_SMP #define smp_mb() mb() -#define smp_rmb() rmb() +#ifdef CONFIG_X86_PPRO_FENCE +# define smp_rmb() rmb() +#else +# define smp_rmb() barrier() +#endif #ifdef CONFIG_X86_OOSTORE # define smp_wmb() wmb() #else diff --git a/trunk/include/asm-x86/system_64.h b/trunk/include/asm-x86/system_64.h index eff730b11926..5022aecc333d 100644 --- a/trunk/include/asm-x86/system_64.h +++ b/trunk/include/asm-x86/system_64.h @@ -141,8 +141,8 @@ static inline void write_cr8(unsigned long val) #ifdef CONFIG_SMP #define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() +#define smp_rmb() barrier() +#define smp_wmb() barrier() #define smp_read_barrier_depends() do {} while(0) #else #define smp_mb() barrier()