Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205430
b: refs/heads/master
c: 48286d5
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Ingo Molnar committed Jun 18, 2010
1 parent 180c0b0 commit d694a2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c32b4fce799d3a6157df9048d03e429956c58818
refs/heads/master: 48286d5088a3ba76de40a6b70221632a49cab7a1
27 changes: 3 additions & 24 deletions trunk/kernel/sched_stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,7 @@ sched_info_switch(struct task_struct *prev, struct task_struct *next)
static inline void account_group_user_time(struct task_struct *tsk,
cputime_t cputime)
{
struct thread_group_cputimer *cputimer;

/* tsk == current, ensure it is safe to use ->signal */
if (unlikely(tsk->exit_state))
return;

cputimer = &tsk->signal->cputimer;
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;

if (!cputimer->running)
return;
Expand All @@ -325,13 +319,7 @@ static inline void account_group_user_time(struct task_struct *tsk,
static inline void account_group_system_time(struct task_struct *tsk,
cputime_t cputime)
{
struct thread_group_cputimer *cputimer;

/* tsk == current, ensure it is safe to use ->signal */
if (unlikely(tsk->exit_state))
return;

cputimer = &tsk->signal->cputimer;
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;

if (!cputimer->running)
return;
Expand All @@ -355,16 +343,7 @@ static inline void account_group_system_time(struct task_struct *tsk,
static inline void account_group_exec_runtime(struct task_struct *tsk,
unsigned long long ns)
{
struct thread_group_cputimer *cputimer;
struct signal_struct *sig;

sig = tsk->signal;
/* see __exit_signal()->task_rq_unlock_wait() */
barrier();
if (unlikely(!sig))
return;

cputimer = &sig->cputimer;
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;

if (!cputimer->running)
return;
Expand Down

0 comments on commit d694a2a

Please sign in to comment.