diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:50:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:50:07 -0800 |
| commit | 5fa2e1591300267b1e082c693d0b4da8e4943551 (patch) | |
| tree | f37a664a6cf23eda2441dea39a7e58de7b8965fe /arch/powerpc/kernel | |
| parent | f194d132e4971111f85c18c96067acffb13cee6d (diff) | |
| parent | 7cc955c8fdd58c5f2c98077011a20ce10897288c (diff) | |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams
[POWERPC] Update defconfigs
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] Update iseries_defconfig
[POWERPC] Fix hardware IRQ time accounting problem.
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 41e13f4cc6e..b9d88374f14 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -350,7 +350,7 @@ struct task_struct *__switch_to(struct task_struct *prev, local_irq_save(flags); account_system_vtime(current); - account_process_tick(current, 0); + account_process_vtime(current); calculate_steal_time(); last = _switch(old_thread, new_thread); |