diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-30 11:33:01 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-30 11:33:01 +0400 |
| commit | 38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (patch) | |
| tree | 58be18cf3dce7a407c84ab2532e92bdb8b7ee067 /arch/powerpc | |
| parent | e9c84cb8d5f1b1ea6fcbe6190d51dc84b6975938 (diff) | |
| parent | 3e1df4f506836e6bea1ab61cf88c75c8b1840643 (diff) | |
| download | linux-38ca9c927c7d3db61f57e3d3a9334958c3af6e9a.tar.xz | |
Merge tag 'cputime-cleanups-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core
Pull cputime cleanups and optimizations from Frederic Weisbecker:
* Gather vtime headers that were a bit scattered around
* Separate irqtime and vtime namespaces that were
colliding, resulting in useless calls to irqtime accounting.
* Slightly optimize irq and guest vtime accounting.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index ce4cb772dc78..0db456f30d45 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -336,7 +336,7 @@ static u64 vtime_delta(struct task_struct *tsk, return delta; } -void vtime_account_system(struct task_struct *tsk) +void __vtime_account_system(struct task_struct *tsk) { u64 delta, sys_scaled, stolen; @@ -346,7 +346,7 @@ void vtime_account_system(struct task_struct *tsk) account_steal_time(stolen); } -void vtime_account_idle(struct task_struct *tsk) +void __vtime_account_idle(struct task_struct *tsk) { u64 delta, sys_scaled, stolen; |