---

yaml --- r: 350127 b: refs/heads/master c: 57d2aa0 h: refs/heads/master i: 350125: eff662a 350123: c484754 350119: 93a7637 350111: 5237ada v: v3
git-mirror · Jan 25, 2013 · 4f15255 · 4f15255
1 parent 4091530
commit 4f15255
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16c8f1c72ece3871a6c93003cd888fc2d003a7eb
+refs/heads/master: 57d2aa00dcec67afa52478730f2b524521af14fb
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1208,6 +1208,7 @@ struct sched_entity {
 struct sched_rt_entity {
 	struct list_head run_list;
 	unsigned long timeout;
+	unsigned long watchdog_stamp;
 	unsigned int time_slice;
 
 	struct sched_rt_entity *back;

diff --git a/trunk/kernel/sched/rt.c b/trunk/kernel/sched/rt.c
@@ -1988,7 +1988,11 @@ static void watchdog(struct rq *rq, struct task_struct *p)
 	if (soft != RLIM_INFINITY) {
 		unsigned long next;
 
-		p->rt.timeout++;
+		if (p->rt.watchdog_stamp != jiffies) {
+			p->rt.timeout++;
+			p->rt.watchdog_stamp = jiffies;
+		}
+
 		next = DIV_ROUND_UP(min(soft, hard), USEC_PER_SEC/HZ);
 		if (p->rt.timeout > next)
 			p->cputime_expires.sched_exp = p->se.sum_exec_runtime;