From e3825bd8180aa7b42c636d2ca783c8b7513457c4 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 14 Jan 2009 10:56:32 +0100
Subject: [PATCH] --- yaml --- r: 129812 b: refs/heads/master c:
 98a4826b99bc4bcc34c604b2fc4fcf4d771600ec h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c2a4f140bbd9..c3f2078874ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e3eb82278bf45221fc38b391bc5ee0f6a314d6
+refs/heads/master: 98a4826b99bc4bcc34c604b2fc4fcf4d771600ec
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 3b630d882660..ed62d1cee05c 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -9050,6 +9050,13 @@ static int tg_schedulable(struct task_group *tg, void *data)
 		runtime = d->rt_runtime;
 	}
 
+#ifdef CONFIG_USER_SCHED
+	if (tg == &root_task_group) {
+		period = global_rt_period();
+		runtime = global_rt_runtime();
+	}
+#endif
+
 	/*
 	 * Cannot have more runtime than the period.
 	 */