diff --git a/[refs] b/[refs]
index 5da4c398ab3a..69c242ff2646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e980a4bd7fc5c9b748f2f0209d2a48c0fdf0ab
+refs/heads/master: 8aa2accee41f7045dc904fa41d4475b2f6ffae3e
diff --git a/trunk/kernel/irq_work.c b/trunk/kernel/irq_work.c
index 4ed17490f629..480f74715ba9 100644
--- a/trunk/kernel/irq_work.c
+++ b/trunk/kernel/irq_work.c
@@ -109,6 +109,9 @@ bool irq_work_needs_cpu(void)
 	if (llist_empty(this_list))
 		return false;
 
+	/* All work should have been flushed before going offline */
+	WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
+
 	return true;
 }