From c8c90e997033a54909abfd43fc1722163d984234 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Jul 2007 18:52:00 +0200
Subject: [PATCH] --- yaml --- r: 58295 b: refs/heads/master c:
 b2cfba19f67228e78e48177187f6b07f4107c784 h: refs/heads/master i:   58293:
 875c9c4a8ea53228349137a17e55827b3ec9cee5   58291:
 bf39825ce9dd42f65ce42872d15e7c47e9ffb482   58287:
 fe2375f5731f9282cb5b183ec5b82e7e53bd4b49 v: v3

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

diff --git a/[refs] b/[refs]
index aad89254c286..315a26d6e29b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c57d5893e4a9857ff22ec9e379f6bdbdad50850
+refs/heads/master: b2cfba19f67228e78e48177187f6b07f4107c784
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 886531c681c1..f8cf78c6af2e 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -208,15 +208,6 @@ struct rt_rq {
 	struct list_head *rt_load_balance_head, *rt_load_balance_curr;
 };
 
-/*
- * The prio-array type of the old scheduler:
- */
-struct prio_array {
-	unsigned int nr_active;
-	DECLARE_BITMAP(bitmap, MAX_PRIO+1); /* include 1 bit for delimiter */
-	struct list_head queue[MAX_PRIO];
-};
-
 /*
  * This is the main, per-CPU runqueue data structure.
  *
@@ -232,7 +223,6 @@ struct rq {
 	 * remote CPUs use both these fields when doing load calculation.
 	 */
 	unsigned long nr_running;
-	unsigned long raw_weighted_load;
 	#define CPU_LOAD_IDX_MAX 5
 	unsigned long cpu_load[CPU_LOAD_IDX_MAX];
 	unsigned char idle_at_tick;
@@ -257,16 +247,10 @@ struct rq {
 	 */
 	unsigned long nr_uninterruptible;
 
-	unsigned long expired_timestamp;
-	unsigned long long most_recent_timestamp;
-
 	struct task_struct *curr, *idle;
 	unsigned long next_balance;
 	struct mm_struct *prev_mm;
 
-	struct prio_array *active, *expired, arrays[2];
-	int best_expired_prio;
-
 	u64 clock, prev_clock_raw;
 	s64 clock_max_delta;