diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:02:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 14:03:08 -0400 |
| commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
| tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /kernel/sched_rt.c | |
| parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
| parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 0335e87f5204..012d69bb67c7 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) | |||
| 1667 | if (!p->signal) | 1667 | if (!p->signal) |
| 1668 | return; | 1668 | return; |
| 1669 | 1669 | ||
| 1670 | soft = p->signal->rlim[RLIMIT_RTTIME].rlim_cur; | 1670 | /* max may change after cur was read, this will be fixed next tick */ |
| 1671 | hard = p->signal->rlim[RLIMIT_RTTIME].rlim_max; | 1671 | soft = task_rlimit(p, RLIMIT_RTTIME); |
| 1672 | hard = task_rlimit_max(p, RLIMIT_RTTIME); | ||
| 1672 | 1673 | ||
| 1673 | if (soft != RLIM_INFINITY) { | 1674 | if (soft != RLIM_INFINITY) { |
| 1674 | unsigned long next; | 1675 | unsigned long next; |