diff --git a/kernel/softirq.c b/kernel/softirq.c
index 4daab24bd4e21d10e3ca3c040ef4abdf0197471a..99a047f70fd265395cc3ea8e1412595772a14cdc 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -344,7 +344,8 @@ asmlinkage __visible void do_softirq(void)
 void irq_enter(void)
 {
 	rcu_irq_enter();
-	if (is_idle_task(current) && !in_interrupt()) {
+	if (tick_nohz_full_cpu(smp_processor_id()) ||
+		(is_idle_task(current) && !in_interrupt())) {
 		/*
 		 * Prevent raise_softirq from needlessly waking up ksoftirqd
 		 * here, as softirq will be serviced on return from interrupt.
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 5b33e2f5c0ed3d2b158e456c2b6748e39f51b629..03f9400894312ffda690986aaf6c7c4b93c29b8d 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -1228,6 +1228,13 @@ static inline void tick_nohz_irq_enter(void)
 	now = ktime_get();
 	if (ts->idle_active)
 		tick_nohz_stop_idle(ts, now);
+	/*
+	 * If all CPUs are idle. We may need to update a stale jiffies value.
+	 * Note nohz_full is a special case: a timekeeper is guaranteed to stay
+	 * alive but it might be busy looping with interrupts disabled in some
+	 * rare case (typically stop machine). So we must make sure we have a
+	 * last resort.
+	 */
 	if (ts->tick_stopped)
 		tick_nohz_update_jiffies(now);
 }