aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-14 17:11:46 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-14 17:11:46 +0200
commit5ce73a4a5a4893a1aa4cdeed1b1a5a6de42c43b6 (patch)
tree7d5207fa5c11d05b515321ffd53082440c312d16 /kernel
parent0a8eaa4f9b58759595a1bfe13a1295fdc25ba026 (diff)
downloadkernel_samsung_smdk4412-5ce73a4a5a4893a1aa4cdeed1b1a5a6de42c43b6.zip
kernel_samsung_smdk4412-5ce73a4a5a4893a1aa4cdeed1b1a5a6de42c43b6.tar.gz
kernel_samsung_smdk4412-5ce73a4a5a4893a1aa4cdeed1b1a5a6de42c43b6.tar.bz2
timers: fix itimer/many thread hang, cleanups
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/posix-cpu-timers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index dba1c33..9a7ea04 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)
cputime = secs_to_cputime(rlim_new);
if (cputime_eq(current->signal->it_prof_expires, cputime_zero) ||
- cputime_lt(current->signal->it_prof_expires, cputime)) {
+ cputime_lt(current->signal->it_prof_expires, cputime)) {
spin_lock_irq(&current->sighand->siglock);
set_process_cpu_timer(current, CPUCLOCK_PROF, &cputime, NULL);
spin_unlock_irq(&current->sighand->siglock);
@@ -1372,9 +1372,9 @@ void run_posix_cpu_timers(struct task_struct *tsk)
* tsk->signal is non-NULL; this probably can't happen but cover the
* possibility anyway.
*/
- if (unlikely(!sig) || !fastpath_timer_check(tsk, sig)) {
+ if (unlikely(!sig) || !fastpath_timer_check(tsk, sig))
return;
- }
+
sighand = lock_task_sighand(tsk, &flags);
if (likely(sighand)) {
/*