diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
| commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
| tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /kernel/debug | |
| parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) | |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/debug')
| -rw-r--r-- | kernel/debug/debug_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index 2956c8da1605..1adf62b39b96 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c | |||
| @@ -534,7 +534,7 @@ return_normal: | |||
| 534 | kgdb_info[cpu].exception_state &= | 534 | kgdb_info[cpu].exception_state &= |
| 535 | ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); | 535 | ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); |
| 536 | kgdb_info[cpu].enter_kgdb--; | 536 | kgdb_info[cpu].enter_kgdb--; |
| 537 | smp_mb__before_atomic_dec(); | 537 | smp_mb__before_atomic(); |
| 538 | atomic_dec(&slaves_in_kgdb); | 538 | atomic_dec(&slaves_in_kgdb); |
| 539 | dbg_touch_watchdogs(); | 539 | dbg_touch_watchdogs(); |
| 540 | local_irq_restore(flags); | 540 | local_irq_restore(flags); |
| @@ -662,7 +662,7 @@ kgdb_restore: | |||
| 662 | kgdb_info[cpu].exception_state &= | 662 | kgdb_info[cpu].exception_state &= |
| 663 | ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); | 663 | ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE); |
| 664 | kgdb_info[cpu].enter_kgdb--; | 664 | kgdb_info[cpu].enter_kgdb--; |
| 665 | smp_mb__before_atomic_dec(); | 665 | smp_mb__before_atomic(); |
| 666 | atomic_dec(&masters_in_kgdb); | 666 | atomic_dec(&masters_in_kgdb); |
| 667 | /* Free kgdb_active */ | 667 | /* Free kgdb_active */ |
| 668 | atomic_set(&kgdb_active, -1); | 668 | atomic_set(&kgdb_active, -1); |
