diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 566257d1dc10..b5efb528aa1d 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1023,13 +1023,11 @@ void account_process_tick(struct task_struct *p, int user_tick) | |||
1023 | { | 1023 | { |
1024 | cputime_t one_jiffy = jiffies_to_cputime(1); | 1024 | cputime_t one_jiffy = jiffies_to_cputime(1); |
1025 | 1025 | ||
1026 | if (user_tick) { | 1026 | if (user_tick) |
1027 | account_user_time(p, one_jiffy); | 1027 | account_user_time(p, one_jiffy, cputime_to_scaled(one_jiffy)); |
1028 | account_user_time_scaled(p, cputime_to_scaled(one_jiffy)); | 1028 | else |
1029 | } else { | 1029 | account_system_time(p, HARDIRQ_OFFSET, one_jiffy, |
1030 | account_system_time(p, HARDIRQ_OFFSET, one_jiffy); | 1030 | cputime_to_scaled(one_jiffy)); |
1031 | account_system_time_scaled(p, cputime_to_scaled(one_jiffy)); | ||
1032 | } | ||
1033 | } | 1031 | } |
1034 | #endif | 1032 | #endif |
1035 | 1033 | ||