diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:11:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:11:46 -0400 |
commit | 5ce73a4a5a4893a1aa4cdeed1b1a5a6de42c43b6 (patch) | |
tree | 7d5207fa5c11d05b515321ffd53082440c312d16 /kernel/posix-cpu-timers.c | |
parent | 0a8eaa4f9b58759595a1bfe13a1295fdc25ba026 (diff) |
timers: fix itimer/many thread hang, cleanups
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/posix-cpu-timers.c')
-rw-r--r-- | kernel/posix-cpu-timers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index dba1c334c3e8..9a7ea049fcdc 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c | |||
@@ -94,7 +94,7 @@ void update_rlimit_cpu(unsigned long rlim_new) | |||
94 | 94 | ||
95 | cputime = secs_to_cputime(rlim_new); | 95 | cputime = secs_to_cputime(rlim_new); |
96 | if (cputime_eq(current->signal->it_prof_expires, cputime_zero) || | 96 | if (cputime_eq(current->signal->it_prof_expires, cputime_zero) || |
97 | cputime_lt(current->signal->it_prof_expires, cputime)) { | 97 | cputime_lt(current->signal->it_prof_expires, cputime)) { |
98 | spin_lock_irq(¤t->sighand->siglock); | 98 | spin_lock_irq(¤t->sighand->siglock); |
99 | set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL); | 99 | set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL); |
100 | spin_unlock_irq(¤t->sighand->siglock); | 100 | spin_unlock_irq(¤t->sighand->siglock); |
@@ -1372,9 +1372,9 @@ void run_posix_cpu_timers(struct task_struct *tsk) | |||
1372 | * tsk->signal is non-NULL; this probably can't happen but cover the | 1372 | * tsk->signal is non-NULL; this probably can't happen but cover the |
1373 | * possibility anyway. | 1373 | * possibility anyway. |
1374 | */ | 1374 | */ |
1375 | if (unlikely(!sig) || !fastpath_timer_check(tsk, sig)) { | 1375 | if (unlikely(!sig) || !fastpath_timer_check(tsk, sig)) |
1376 | return; | 1376 | return; |
1377 | } | 1377 | |
1378 | sighand = lock_task_sighand(tsk, &flags); | 1378 | sighand = lock_task_sighand(tsk, &flags); |
1379 | if (likely(sighand)) { | 1379 | if (likely(sighand)) { |
1380 | /* | 1380 | /* |