Skip to content

Commit

Permalink
timers: fix itimer/many thread hang, cleanups
Browse files Browse the repository at this point in the history
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Sep 14, 2008
1 parent 0a8eaa4 commit 5ce73a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ struct pacct_struct {
* @utime: time spent in user mode, in &cputime_t units
* @stime: time spent in kernel mode, in &cputime_t units
* @sum_exec_runtime: total time spent on the CPU, in nanoseconds
*
*
* This structure groups together three kinds of CPU time that are
* tracked for threads and thread groups. Most things considering
* CPU time want to group these counts together and treat all three
Expand Down
6 changes: 3 additions & 3 deletions kernel/posix-cpu-timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)) {
/*
Expand Down

0 comments on commit 5ce73a4

Please sign in to comment.