Restore "Revert: smp/hotplug: Differentiate the AP-work lockdep class between up...

Change-Id: I812e559c85e88b67fa44a32973d0679b7486e243
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 6099ca833dbd477e6c1526f11d06533bb821f8fa..0aa6637bb1027d3b4a7c6059d6a4790d98eb589e 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -685,14 +685,10 @@ static void cpuhp_thread_fun(unsigned int cpu)
         */
        smp_mb();
 
-<<<<<<< HEAD
        if (WARN_ON_ONCE(!st->should_run))
                return;
 
        lock_map_acquire(&cpuhp_state_lock_map);
-=======
-       cpuhp_lock_acquire(bringup);
->>>>>>> android-4.14-p
 
        if (st->single) {
                state = st->cb_state;