diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 9d3ca28c6f8d498ae86ce41fc746e060d12cda53..15786f02728fc5976de58a66b9c276017f269ede 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -471,14 +471,12 @@ void watchdog_enable(unsigned int cpu)
 
 void watchdog_disable(unsigned int cpu)
 {
-	struct hrtimer *hrtimer = this_cpu_ptr(&watchdog_hrtimer);
+	struct hrtimer *hrtimer = per_cpu_ptr(&watchdog_hrtimer, cpu);
 	unsigned int *enabled = per_cpu_ptr(&watchdog_en, cpu);
 
 	if (!*enabled)
 		return;
 
-	WARN_ON_ONCE(cpu != smp_processor_id());
-
 	/*
 	 * Disable the perf event first. That prevents that a large delay
 	 * between disabling the timer and disabling the perf event causes
@@ -486,7 +484,7 @@ void watchdog_disable(unsigned int cpu)
 	 */
 	watchdog_nmi_disable(cpu);
 	hrtimer_cancel(hrtimer);
-	wait_for_completion(this_cpu_ptr(&softlockup_completion));
+	wait_for_completion(per_cpu_ptr(&softlockup_completion, cpu));
 
 	/*
 	 * No need for barrier here since disabling the watchdog is