aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sched.h2
-rw-r--r--kernel/posix-cpu-timers.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ed355f02d329..7ce8d4e53565 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -430,7 +430,7 @@ struct pacct_struct {
430 * @utime: time spent in user mode, in &cputime_t units 430 * @utime: time spent in user mode, in &cputime_t units
431 * @stime: time spent in kernel mode, in &cputime_t units 431 * @stime: time spent in kernel mode, in &cputime_t units
432 * @sum_exec_runtime: total time spent on the CPU, in nanoseconds 432 * @sum_exec_runtime: total time spent on the CPU, in nanoseconds
433 * 433 *
434 * This structure groups together three kinds of CPU time that are 434 * This structure groups together three kinds of CPU time that are
435 * tracked for threads and thread groups. Most things considering 435 * tracked for threads and thread groups. Most things considering
436 * CPU time want to group these counts together and treat all three 436 * CPU time want to group these counts together and treat all three
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(&current->sighand->siglock); 98 spin_lock_irq(&current->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(&current->sighand->siglock); 100 spin_unlock_irq(&current->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 /*