From eb00af4e4e22de2fa29df0b726f8dbaf3717f8ff Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 11 Jul 2012 20:26:36 +0200
Subject: [PATCH] --- yaml --- r: 323593 b: refs/heads/master c:
 90a340ed53f0f3bcc3fdf1b2cff56c0e4e911d01 h: refs/heads/master i:   323591:
 24800bcbbf45705d8e89c87a6f9cc9cdc907238a v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched/core.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f4112e48d1c7..2230f2b4ad29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ba3c97a38803883c2eee489505796cb0a727122
+refs/heads/master: 90a340ed53f0f3bcc3fdf1b2cff56c0e4e911d01
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
index ea2213b07d9d..4adcd237c545 100644
--- a/trunk/kernel/sched/core.c
+++ b/trunk/kernel/sched/core.c
@@ -3570,6 +3570,7 @@ asmlinkage void __sched preempt_schedule_irq(void)
 	/* Catch callers which need to be fixed */
 	BUG_ON(ti->preempt_count || !irqs_disabled());
 
+	rcu_user_exit();
 	do {
 		add_preempt_count(PREEMPT_ACTIVE);
 		local_irq_enable();