diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 0735f0aa3afb..8521d10fbb27 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -826,10 +826,13 @@ void update_process_times(int user_tick) | |||
826 | int cpu = smp_processor_id(); | 826 | int cpu = smp_processor_id(); |
827 | 827 | ||
828 | /* Note: this timer irq context must be accounted for as well. */ | 828 | /* Note: this timer irq context must be accounted for as well. */ |
829 | if (user_tick) | 829 | if (user_tick) { |
830 | account_user_time(p, jiffies_to_cputime(1)); | 830 | account_user_time(p, jiffies_to_cputime(1)); |
831 | else | 831 | account_user_time_scaled(p, jiffies_to_cputime(1)); |
832 | } else { | ||
832 | account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1)); | 833 | account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1)); |
834 | account_system_time_scaled(p, jiffies_to_cputime(1)); | ||
835 | } | ||
833 | run_local_timers(); | 836 | run_local_timers(); |
834 | if (rcu_pending(cpu)) | 837 | if (rcu_pending(cpu)) |
835 | rcu_check_callbacks(cpu, user_tick); | 838 | rcu_check_callbacks(cpu, user_tick); |