---

yaml --- r: 323594 b: refs/heads/master c: 20ab65e h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · ab9b6f4 · ab9b6f4
1 parent eb00af4
commit ab9b6f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90a340ed53f0f3bcc3fdf1b2cff56c0e4e911d01
+refs/heads/master: 20ab65e33f469c35f3dabde3445b668aa9c943ee
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -3469,6 +3469,21 @@ asmlinkage void __sched schedule(void)
 }
 EXPORT_SYMBOL(schedule);
 
+#ifdef CONFIG_RCU_USER_QS
+asmlinkage void __sched schedule_user(void)
+{
+	/*
+	 * If we come here after a random call to set_need_resched(),
+	 * or we have been woken up remotely but the IPI has not yet arrived,
+	 * we haven't yet exited the RCU idle mode. Do it here manually until
+	 * we find a better solution.
+	 */
+	rcu_user_exit();
+	schedule();
+	rcu_user_enter();
+}
+#endif
+
 /**
  * schedule_preempt_disabled - called with preemption disabled
  *