diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-13 21:30:15 +0300 |
| commit | 82045dd85566d87128dcc66277cf1177d9930a4a (patch) | |
| tree | 22fea6311a4866293005a1a44f34310e4007a3c9 /kernel/locking/spinlock_debug.c | |
| parent | e0478542cfd4d993e38d5f92a3f3ecd238805e96 (diff) | |
| parent | ffa6f55eb6188ee73339cab710fabf30d13110a7 (diff) | |
| download | linux-82045dd85566d87128dcc66277cf1177d9930a4a.tar.xz | |
Merge branch 'linus' into core/urgent, to merge in dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/spinlock_debug.c')
| -rw-r--r-- | kernel/locking/spinlock_debug.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c index 9aa0fccd5d43..399669f7eba8 100644 --- a/kernel/locking/spinlock_debug.c +++ b/kernel/locking/spinlock_debug.c @@ -111,6 +111,7 @@ void do_raw_spin_lock(raw_spinlock_t *lock) { debug_spin_lock_before(lock); arch_spin_lock(&lock->raw_lock); + mmiowb_spin_lock(); debug_spin_lock_after(lock); } @@ -118,8 +119,10 @@ int do_raw_spin_trylock(raw_spinlock_t *lock) { int ret = arch_spin_trylock(&lock->raw_lock); - if (ret) + if (ret) { + mmiowb_spin_lock(); debug_spin_lock_after(lock); + } #ifndef CONFIG_SMP /* * Must not happen on UP: @@ -131,6 +134,7 @@ int do_raw_spin_trylock(raw_spinlock_t *lock) void do_raw_spin_unlock(raw_spinlock_t *lock) { + mmiowb_spin_unlock(); debug_spin_unlock(lock); arch_spin_unlock(&lock->raw_lock); } |