Merge commit '3cf2f34' into sched/core, to fix build error

Fix this dependency on the locking tree's smp_mb*() API changes:

  kernel/sched/idle.c:247:3: error: implicit declaration of function ‘smp_mb__after_atomic’ [-Werror=implicit-function-declaration]

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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:
                         kgdb_info[cpu].exception_state &=
                                 ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE);
                         kgdb_info[cpu].enter_kgdb--;
-                        smp_mb__before_atomic_dec();
+                        smp_mb__before_atomic();
                         atomic_dec(&slaves_in_kgdb);
                         dbg_touch_watchdogs();
                         local_irq_restore(flags);
@@ -662,7 +662,7 @@ kgdb_restore:
         kgdb_info[cpu].exception_state &=
                 ~(DCPU_WANT_MASTER | DCPU_IS_SLAVE);
         kgdb_info[cpu].enter_kgdb--;
-        smp_mb__before_atomic_dec();
+        smp_mb__before_atomic();
         atomic_dec(&masters_in_kgdb);
         /* Free kgdb_active */
         atomic_set(&kgdb_active, -1);