From b9ed490d703ebbfeaebcb6cab951bdd5acff674b Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 7 Oct 2011 16:31:02 -0700
Subject: [PATCH] --- yaml --- r: 277212 b: refs/heads/master c:
 416eb33cd60ef405e2860a186364e57bcb2d89f6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae07e937ac37..4eba1ae22d8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98ad1cc14a5c4fd658f9d72c6ba5c86dfd3ce0d5
+refs/heads/master: 416eb33cd60ef405e2860a186364e57bcb2d89f6
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index f9f2aa81ce53..4eb3a0fa351e 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -347,12 +347,12 @@ void irq_exit(void)
 	if (!in_interrupt() && local_softirq_pending())
 		invoke_softirq();
 
-	rcu_irq_exit();
 #ifdef CONFIG_NO_HZ
 	/* Make sure that timer wheel updates are propagated */
 	if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
 		tick_nohz_irq_exit();
 #endif
+	rcu_irq_exit();
 	preempt_enable_no_resched();
 }