X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=blobdiff_plain;f=kernel%2Fsched_rt.c;h=b5b920ae2ea7fe83ca17d2c94d0a7b638574144c;hp=c4fb42a66cab2afd9972ba17beeb110be8e283b3;hb=80a186074e72e2cd61f6716d90cf32ce54981a56;hpb=3d07467b7aa91623b31d7b5888a123a2c8c8e9cc

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index c4fb42a..b5b920a 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1667,8 +1667,9 @@ static void watchdog(struct rq *rq, struct task_struct *p)
 	if (!p->signal)
 		return;
 
-	soft = p->signal->rlim[RLIMIT_RTTIME].rlim_cur;
-	hard = p->signal->rlim[RLIMIT_RTTIME].rlim_max;
+	/* max may change after cur was read, this will be fixed next tick */
+	soft = task_rlimit(p, RLIMIT_RTTIME);
+	hard = task_rlimit_max(p, RLIMIT_RTTIME);
 
 	if (soft != RLIM_INFINITY) {
 		unsigned long next;