diff options
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r-- | arch/powerpc/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index e1f3a5140429..92650ccad2e1 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -256,8 +256,7 @@ void account_system_vtime(struct task_struct *tsk) | |||
256 | delta += sys_time; | 256 | delta += sys_time; |
257 | get_paca()->system_time = 0; | 257 | get_paca()->system_time = 0; |
258 | } | 258 | } |
259 | account_system_time(tsk, 0, delta); | 259 | account_system_time(tsk, 0, delta, deltascaled); |
260 | account_system_time_scaled(tsk, deltascaled); | ||
261 | per_cpu(cputime_last_delta, smp_processor_id()) = delta; | 260 | per_cpu(cputime_last_delta, smp_processor_id()) = delta; |
262 | per_cpu(cputime_scaled_last_delta, smp_processor_id()) = deltascaled; | 261 | per_cpu(cputime_scaled_last_delta, smp_processor_id()) = deltascaled; |
263 | local_irq_restore(flags); | 262 | local_irq_restore(flags); |
@@ -275,10 +274,8 @@ void account_process_tick(struct task_struct *tsk, int user_tick) | |||
275 | 274 | ||
276 | utime = get_paca()->user_time; | 275 | utime = get_paca()->user_time; |
277 | get_paca()->user_time = 0; | 276 | get_paca()->user_time = 0; |
278 | account_user_time(tsk, utime); | ||
279 | |||
280 | utimescaled = cputime_to_scaled(utime); | 277 | utimescaled = cputime_to_scaled(utime); |
281 | account_user_time_scaled(tsk, utimescaled); | 278 | account_user_time(tsk, utime, utimescaled); |
282 | } | 279 | } |
283 | 280 | ||
284 | /* | 281 | /* |