From bd832fc888b3835f726b974f906f39aad0538dce Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Jul 2007 18:51:58 +0200
Subject: [PATCH] --- yaml --- r: 58275 b: refs/heads/master c:
 138a8aeb5b9e5c5abd5e5ec22b6d1848e7e9c50b h: refs/heads/master i:   58273:
 f809a03ae61a3dce013392b8e95a118f52f2acde   58271:
 fa36a9d5fb5abc82b415d5f2251116d5a9af1583 v: v3

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

diff --git a/[refs] b/[refs]
index 50c7931e6c97..587818efeaf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41b86e9c510ae66639bf29d3201e1d2384a7fde6
+refs/heads/master: 138a8aeb5b9e5c5abd5e5ec22b6d1848e7e9c50b
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 0333abdda85e..d9ed9274bf0a 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -449,6 +449,18 @@ static inline unsigned long long rq_clock(struct rq *rq)
 #define task_rq(p)		cpu_rq(task_cpu(p))
 #define cpu_curr(cpu)		(cpu_rq(cpu)->curr)
 
+#ifdef CONFIG_FAIR_GROUP_SCHED
+/* Change a task's ->cfs_rq if it moves across CPUs */
+static inline void set_task_cfs_rq(struct task_struct *p)
+{
+	p->se.cfs_rq = &task_rq(p)->cfs;
+}
+#else
+static inline void set_task_cfs_rq(struct task_struct *p)
+{
+}
+#endif
+
 #ifndef prepare_arch_switch
 # define prepare_arch_switch(next)	do { } while (0)
 #endif