aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:50:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:50:07 -0500
commit5fa2e1591300267b1e082c693d0b4da8e4943551 (patch)
treef37a664a6cf23eda2441dea39a7e58de7b8965fe /include/asm-powerpc
parentf194d132e4971111f85c18c96067acffb13cee6d (diff)
parent7cc955c8fdd58c5f2c98077011a20ce10897288c (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.h8
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 {
237 237
238DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array); 238DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);
239 239
240#ifdef CONFIG_VIRT_CPU_ACCOUNTING
241extern void account_process_vtime(struct task_struct *tsk);
242#else
243#define account_process_vtime(tsk) do { } while (0)
244#endif
245
246#if defined(CONFIG_VIRT_CPU_ACCOUNTING) 240#if defined(CONFIG_VIRT_CPU_ACCOUNTING)
247extern void calculate_steal_time(void); 241extern void calculate_steal_time(void);
248extern void snapshot_timebases(void); 242extern void snapshot_timebases(void);
243#define account_process_vtime(tsk) account_process_tick(tsk, 0)
249#else 244#else
250#define calculate_steal_time() do { } while (0) 245#define calculate_steal_time() do { } while (0)
251#define snapshot_timebases() do { } while (0) 246#define snapshot_timebases() do { } while (0)
247#define account_process_vtime(tsk) do { } while (0)
252#endif 248#endif
253 249
254extern void secondary_cpu_time_init(void); 250extern void secondary_cpu_time_init(void);