From 81f9203d2561a35f5c0034d1115294fc7918ecfa Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 25 Jan 2008 21:08:03 +0100
Subject: [PATCH] --- yaml --- r: 76123 b: refs/heads/master c:
 63489e45e265f64c368882be1f01c42dec5d984c h: refs/heads/master i:   76121:
 e8dbe8bc4d772f47851bea28033ddf7519aed194   76119:
 505472335a465cf29d7557d3007fdf8ea3e6ed92 v: v3

---
 [refs]                  |  2 +-
 trunk/kernel/sched.c    |  1 +
 trunk/kernel/sched_rt.c | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9cbe723a8245..f9627e616410 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a1fcb90287052aabfa235e7ffc693ea003fe69
+refs/heads/master: 63489e45e265f64c368882be1f01c42dec5d984c
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 5b3d46574eeb..9dd8d121eea6 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -342,6 +342,7 @@ struct rt_rq {
 	struct rt_prio_array active;
 	int rt_load_balance_idx;
 	struct list_head *rt_load_balance_head, *rt_load_balance_curr;
+	unsigned long rt_nr_running;
 };
 
 /*
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
index cefcd5105146..e3d2ca8832af 100644
--- a/trunk/kernel/sched_rt.c
+++ b/trunk/kernel/sched_rt.c
@@ -26,6 +26,19 @@ static void update_curr_rt(struct rq *rq)
 	cpuacct_charge(curr, delta_exec);
 }
 
+static inline void inc_rt_tasks(struct task_struct *p, struct rq *rq)
+{
+	WARN_ON(!rt_task(p));
+	rq->rt.rt_nr_running++;
+}
+
+static inline void dec_rt_tasks(struct task_struct *p, struct rq *rq)
+{
+	WARN_ON(!rt_task(p));
+	WARN_ON(!rq->rt.rt_nr_running);
+	rq->rt.rt_nr_running--;
+}
+
 static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup)
 {
 	struct rt_prio_array *array = &rq->rt.active;
@@ -33,6 +46,8 @@ static void enqueue_task_rt(struct rq *rq, struct task_struct *p, int wakeup)
 	list_add_tail(&p->run_list, array->queue + p->prio);
 	__set_bit(p->prio, array->bitmap);
 	inc_cpu_load(rq, p->se.load.weight);
+
+	inc_rt_tasks(p, rq);
 }
 
 /*
@@ -48,6 +63,8 @@ static void dequeue_task_rt(struct rq *rq, struct task_struct *p, int sleep)
 	if (list_empty(array->queue + p->prio))
 		__clear_bit(p->prio, array->bitmap);
 	dec_cpu_load(rq, p->se.load.weight);
+
+	dec_rt_tasks(p, rq);
 }
 
 /*