Merge tag 'v3.10.92' into update

This is the 3.10.92 stable release
2018-03-21 22:49:35 +01:00
parent d50b84c473 d17332ebfb
commit 4511a4e21f
20 changed files with 71 additions and 42 deletions
@@ -1466,13 +1466,13 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
 	timer_stats_timer_set_start_info(&dwork->timer);

 	dwork->wq = wq;
+	/* timer isn't guaranteed to run in this cpu, record earlier */
+	if (cpu == WORK_CPU_UNBOUND)
+		cpu = raw_smp_processor_id();
 	dwork->cpu = cpu;
 	timer->expires = jiffies + delay;

-	if (unlikely(cpu != WORK_CPU_UNBOUND))
-		add_timer_on(timer, cpu);
-	else
-		add_timer(timer);
+	add_timer_on(timer, cpu);
 }

 /**