diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-12 15:38:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-12 15:39:04 -0400 |
| commit | f46a6804135795f77d096ab0128f27531c7d051c (patch) | |
| tree | 7cd33f69e3661327739ae4c96e5a8389e7fc912e /kernel/sched_rt.c | |
| parent | b3e84ffa21f916e3354a12a7f19169c9febe96d0 (diff) | |
| parent | ad41a1e0cab07c5125456e8d38e5b1ab148d04aa (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 8afb953e31c6..d10c80ebb67a 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -1663,9 +1663,6 @@ static void watchdog(struct rq *rq, struct task_struct *p) | |||
| 1663 | { | 1663 | { |
| 1664 | unsigned long soft, hard; | 1664 | unsigned long soft, hard; |
| 1665 | 1665 | ||
| 1666 | if (!p->signal) | ||
| 1667 | return; | ||
| 1668 | |||
| 1669 | /* max may change after cur was read, this will be fixed next tick */ | 1666 | /* max may change after cur was read, this will be fixed next tick */ |
| 1670 | soft = task_rlimit(p, RLIMIT_RTTIME); | 1667 | soft = task_rlimit(p, RLIMIT_RTTIME); |
| 1671 | hard = task_rlimit_max(p, RLIMIT_RTTIME); | 1668 | hard = task_rlimit_max(p, RLIMIT_RTTIME); |
