diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-06-11 05:01:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-18 12:41:22 -0400 |
| commit | 4f3aaf2c2ba35bc2cd823a240f9969ebfb3c7549 (patch) | |
| tree | 829a86b8a52cb6f3dc460bb0fb0a7f8161024585 | |
| parent | ebe06187bf2aec10d537ce4595e416035367d703 (diff) | |
x86, locking: Use no more OOSTORE nonsense
Paul reported that X86_OOSTORE is dead, yay! Update a comment and
remove a newly added reference.
Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Waiman Long <Waiman.Long@hp.com>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/20140611090509.GC3588@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/qrwlock.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 5c7198cca5ed..0f4460b5636d 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | #if defined(CONFIG_X86_PPRO_FENCE) | 99 | #if defined(CONFIG_X86_PPRO_FENCE) |
| 100 | 100 | ||
| 101 | /* | 101 | /* |
| 102 | * For either of these options x86 doesn't have a strong TSO memory | 102 | * For this option x86 doesn't have a strong TSO memory |
| 103 | * model and we should fall back to full barriers. | 103 | * model and we should fall back to full barriers. |
| 104 | */ | 104 | */ |
| 105 | 105 | ||
diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h index 70f46f07f94e..ae0e241e228b 100644 --- a/arch/x86/include/asm/qrwlock.h +++ b/arch/x86/include/asm/qrwlock.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/qrwlock_types.h> | 4 | #include <asm-generic/qrwlock_types.h> |
| 5 | 5 | ||
| 6 | #if !defined(CONFIG_X86_OOSTORE) && !defined(CONFIG_X86_PPRO_FENCE) | 6 | #ifndef CONFIG_X86_PPRO_FENCE |
| 7 | #define queue_write_unlock queue_write_unlock | 7 | #define queue_write_unlock queue_write_unlock |
| 8 | static inline void queue_write_unlock(struct qrwlock *lock) | 8 | static inline void queue_write_unlock(struct qrwlock *lock) |
| 9 | { | 9 | { |