From 12083299421ec3194a893fc73814fae5dd4e7b88 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sat, 20 Apr 2013 17:43:13 +0200
Subject: [PATCH] --- yaml --- r: 372927 b: refs/heads/master c:
 67826eae8c16dbf00c262be6ec15021bb42f69c4 h: refs/heads/master i:   372925:
 88531dfbe492661a350f402b616b756bf8895da5   372923:
 d8582f5f1b8f3f1b09cdd4ff0384e3f0d7eb0190   372919:
 6453881b78427daea91b6daca0c30569e7309342   372911:
 c22b93fd350d7f070f1085e4ddb8674910db2d57   372895:
 58a754bfaa2bb8c36f2f9706872dab2757f9f683   372863:
 d05a1aa5295718a415bc6c73a544ffa5caf950bf v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/softirq.c | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b66d91c51ae8..e9df8de855ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e5ada9407cc19d7c4c05ce2165f20dc46fc093
+refs/heads/master: 67826eae8c16dbf00c262be6ec15021bb42f69c4
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index de15813f2a66..8b1446d4a4db 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -337,6 +337,19 @@ static inline void invoke_softirq(void)
 	}
 }
 
+static inline void tick_irq_exit(void)
+{
+#ifdef CONFIG_NO_HZ_COMMON
+	int cpu = smp_processor_id();
+
+	/* Make sure that timer wheel updates are propagated */
+	if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
+		if (!in_interrupt())
+			tick_nohz_irq_exit();
+	}
+#endif
+}
+
 /*
  * Exit an interrupt context. Process softirqs if needed and possible:
  */
@@ -348,11 +361,7 @@ void irq_exit(void)
 	if (!in_interrupt() && local_softirq_pending())
 		invoke_softirq();
 
-#ifdef CONFIG_NO_HZ_COMMON
-	/* Make sure that timer wheel updates are propagated */
-	if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
-		tick_nohz_irq_exit();
-#endif
+	tick_irq_exit();
 	rcu_irq_exit();
 	sched_preempt_enable_no_resched();
 }