Revert "x86/split_lock: Fix the delayed detection logic"

Revert the patch "e726b7b7f029 <x86/split_lock: Fix the delayed detection
logic>".

Signed-off-by: LeoLiu-oc <[email protected]>

Author: leoliu-oc

arch/x86/kernel/cpu/intel.c

@@ -1168,13 +1168,7 @@ static void __split_lock_reenable(struct work_struct *work)
 {
 	sld_update_msr(true);
 }
-/*
- * In order for each CPU to schedule its delayed work independently of the
- * others, delayed work struct must be per-CPU. This is not required when
- * sysctl_sld_mitigate is enabled because of the semaphore that limits
- * the number of simultaneously scheduled delayed works to 1.
- */
-static DEFINE_PER_CPU(struct delayed_work, sl_reenable);
+static DECLARE_DELAYED_WORK(sl_reenable, __split_lock_reenable);
 
 /*
  * If a CPU goes offline with pending delayed work to re-enable split lock
@@ -1195,7 +1189,7 @@ static int splitlock_cpu_offline(unsigned int cpu)
 
 static void split_lock_warn(unsigned long ip)
 {
-	struct delayed_work *work = NULL;
+	struct delayed_work *work;
 	int cpu;
 
 	if (!current->reported_split_lock)
@@ -1217,17 +1211,11 @@ static void split_lock_warn(unsigned long ip)
 		if (down_interruptible(&buslock_sem) == -EINTR)
 			return;
 		work = &sl_reenable_unlock;
+	} else {
+		work = &sl_reenable;
 	}
 
 	cpu = get_cpu();
-
-	if (!work) {
-		work = this_cpu_ptr(&sl_reenable);
-		/* Deferred initialization of per-CPU struct */
-		if (!work->work.func)
-			INIT_DELAYED_WORK(work, __split_lock_reenable);
-	}
-
 	schedule_delayed_work_on(cpu, work, 2);
 
 	/* Disable split lock detection on this CPU to make progress */