summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-09 20:18:24 -0700
committerDavid S. Miller <davem@davemloft.net>2009-07-09 20:18:24 -0700
commite5a8a896f5180f2950695d2d0b79db348d200ca4 (patch)
tree04adc57ae51a6d30a89ffae970770b81ee81fc23 /arch
parentbff38771e1065c7fc3de87e47ba366151eea573c (diff)
parente594e96e8a14101a6decabf6746bd5186287debc (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/spinlock.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index b7e5db876399..4e77853321db 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -302,4 +302,8 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
#define _raw_read_relax(lock) cpu_relax()
#define _raw_write_relax(lock) cpu_relax()
+/* The {read|write|spin}_lock() on x86 are full memory barriers. */
+static inline void smp_mb__after_lock(void) { }
+#define ARCH_HAS_SMP_MB_AFTER_LOCK
+
#endif /* _ASM_X86_SPINLOCK_H */