diff options
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1b59e265273..8f977d5cc51 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5031,17 +5031,16 @@ void account_idle_time(cputime_t cputime)   */  void account_process_tick(struct task_struct *p, int user_tick)  { -	cputime_t one_jiffy = jiffies_to_cputime(1); -	cputime_t one_jiffy_scaled = cputime_to_scaled(one_jiffy); +	cputime_t one_jiffy_scaled = cputime_to_scaled(cputime_one_jiffy);  	struct rq *rq = this_rq();  	if (user_tick) -		account_user_time(p, one_jiffy, one_jiffy_scaled); +		account_user_time(p, cputime_one_jiffy, one_jiffy_scaled);  	else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET)) -		account_system_time(p, HARDIRQ_OFFSET, one_jiffy, +		account_system_time(p, HARDIRQ_OFFSET, cputime_one_jiffy,  				    one_jiffy_scaled);  	else -		account_idle_time(one_jiffy); +		account_idle_time(cputime_one_jiffy);  }  /*  |