From: Youngmin Nam <youngmin.nam@samsung.com>
Date: Thu, 2 May 2019 10:24:22 +0000 (+0900)
Subject: Restore "Revert: smp/hotplug: Differentiate the AP-work lockdep class between up... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81a5d4a05d97951086e54eefd79417e5c05bf30d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

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

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 6099ca833dbd..0aa6637bb102 100644
--- 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;