diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-14 22:54:21 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-14 22:54:21 -0400 |
| commit | 3ec10cd8b526c6b10170c2649002672ee2019e73 (patch) | |
| tree | 27e3fb26020877ae43d3bcc5996c058957df3dc3 /arch/powerpc/kernel/time.c | |
| parent | 993916203f00e8c62599466a5caa866e09f0fae3 (diff) | |
| parent | 1be99f6c95e6c887756f789a60d15771235acd0c (diff) | |
Merge commit 'v2.6.38.3' into linaro-2.6.38
Diffstat (limited to 'arch/powerpc/kernel/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index fcbe3f5c074..59abf59ef6c 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -357,7 +357,7 @@ void account_system_vtime(struct task_struct *tsk) } get_paca()->user_time_scaled += user_scaled; - if (in_irq() || idle_task(smp_processor_id()) != tsk) { + if (in_interrupt() || idle_task(smp_processor_id()) != tsk) { account_system_time(tsk, 0, delta, sys_scaled); if (stolen) account_steal_time(stolen); |