aboutsummaryrefslogtreecommitdiff
path: root/include/asm-powerpc/time.h
diff options
context:
space:
mode:
authorTony Breeds <tony@bakeyournoodle.com>2007-12-04 16:51:44 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-06 16:08:59 +1100
commit81a3843f97cff5fef7b6006fcd2d015d3c4b569f (patch)
tree1175e61f0c23f935d522996220967e81b6e92880 /include/asm-powerpc/time.h
parent7e1fb765c613298d861f80fa18af26df87a4ec19 (diff)
[POWERPC] Fix hardware IRQ time accounting problem.
The commit fa13a5a1f25f671d084d8884be96fc48d9b68275 (sched: restore deterministic CPU accounting on powerpc), unconditionally calls update_process_tick() in system context. In the deterministic accounting case this is the correct thing to do. However, in the non-deterministic accounting case we need to not do this, since doing this results in the time accounted as hardware irq time being artificially elevated. Also this collapses 2 consecutive '#ifdef CONFIG_VIRT_CPU_ACCOUNTING' checks in time.h into one for neatness. Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/time.h')
-rw-r--r--include/asm-powerpc/time.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index 780f8264275..ce5de6e0e69 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -237,18 +237,14 @@ struct cpu_usage {
DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-extern void account_process_vtime(struct task_struct *tsk);
-#else
-#define account_process_vtime(tsk) do { } while (0)
-#endif
-
#if defined(CONFIG_VIRT_CPU_ACCOUNTING)
extern void calculate_steal_time(void);
extern void snapshot_timebases(void);
+#define account_process_vtime(tsk) account_process_tick(tsk, 0)
#else
#define calculate_steal_time() do { } while (0)
#define snapshot_timebases() do { } while (0)
+#define account_process_vtime(tsk) do { } while (0)
#endif
extern void secondary_cpu_time_init(void);