diff options
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index ce4cb772dc78..a667aaf85846 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -355,15 +355,15 @@ void vtime_account_idle(struct task_struct *tsk) | |||
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | /* | 357 | /* |
| 358 | * Transfer the user and system times accumulated in the paca | 358 | * Transfer the user time accumulated in the paca |
| 359 | * by the exception entry and exit code to the generic process | 359 | * by the exception entry and exit code to the generic |
| 360 | * user and system time records. | 360 | * process user time records. |
| 361 | * Must be called with interrupts disabled. | 361 | * Must be called with interrupts disabled. |
| 362 | * Assumes that vtime_account() has been called recently | 362 | * Assumes that vtime_account_system/idle() has been called |
| 363 | * (i.e. since the last entry from usermode) so that | 363 | * recently (i.e. since the last entry from usermode) so that |
| 364 | * get_paca()->user_time_scaled is up to date. | 364 | * get_paca()->user_time_scaled is up to date. |
| 365 | */ | 365 | */ |
| 366 | void account_process_tick(struct task_struct *tsk, int user_tick) | 366 | void vtime_account_user(struct task_struct *tsk) |
| 367 | { | 367 | { |
| 368 | cputime_t utime, utimescaled; | 368 | cputime_t utime, utimescaled; |
| 369 | 369 | ||
| @@ -378,7 +378,7 @@ void account_process_tick(struct task_struct *tsk, int user_tick) | |||
| 378 | void vtime_task_switch(struct task_struct *prev) | 378 | void vtime_task_switch(struct task_struct *prev) |
| 379 | { | 379 | { |
| 380 | vtime_account(prev); | 380 | vtime_account(prev); |
| 381 | account_process_tick(prev, 0); | 381 | vtime_account_user(prev); |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | #else /* ! CONFIG_VIRT_CPU_ACCOUNTING */ | 384 | #else /* ! CONFIG_VIRT_CPU_ACCOUNTING */ |