From c6938b38d69821925a87e53386217b16b725d2eb Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Mon, 1 Feb 2010 11:13:39 +0100
Subject: [PATCH] --- yaml --- r: 182514 b: refs/heads/master c:
 4a461c85b643258e305eb5a3aced34009db2f818 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index d6c38093d15f..8bfaa5e5035e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90fdbdb48442a03c72cae5463e6edb64cb3a3a7d
+refs/heads/master: 4a461c85b643258e305eb5a3aced34009db2f818
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index a56ead42d651..2386f5440002 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1633,16 +1633,6 @@ static void update_shares(struct sched_domain *sd)
 	}
 }
 
-static void update_shares_locked(struct rq *rq, struct sched_domain *sd)
-{
-	if (root_task_group_empty())
-		return;
-
-	raw_spin_unlock(&rq->lock);
-	update_shares(sd);
-	raw_spin_lock(&rq->lock);
-}
-
 static void update_h_load(long cpu)
 {
 	if (root_task_group_empty())
@@ -1657,10 +1647,6 @@ static inline void update_shares(struct sched_domain *sd)
 {
 }
 
-static inline void update_shares_locked(struct rq *rq, struct sched_domain *sd)
-{
-}
-
 #endif
 
 #ifdef CONFIG_PREEMPT