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 /include/asm-powerpc | |
| 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 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/time.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 780f82642756..ce5de6e0e690 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); |