diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-11 13:28:26 +1000 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /include/asm-powerpc/time.h | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
| download | op-kernel-dev-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip op-kernel-dev-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.gz | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'include/asm-powerpc/time.h')
| -rw-r--r-- | include/asm-powerpc/time.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 3fd57c0..d7f5ddf 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h @@ -232,7 +232,7 @@ extern void account_process_vtime(struct task_struct *tsk); #define account_process_vtime(tsk) do { } while (0) #endif -#if defined(CONFIG_VIRT_CPU_ACCOUNTING) && defined(CONFIG_PPC_SPLPAR) +#if defined(CONFIG_VIRT_CPU_ACCOUNTING) extern void calculate_steal_time(void); extern void snapshot_timebases(void); #else @@ -240,5 +240,7 @@ extern void snapshot_timebases(void); #define snapshot_timebases() do { } while (0) #endif +extern void iSeries_time_init_early(void); + #endif /* __KERNEL__ */ #endif /* __POWERPC_TIME_H */ |
