diff options
| author | Jaswinder Singh <jaswinder@infradead.org> | 2008-07-21 21:52:51 +0530 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 14:36:01 +0200 |
| commit | cc0384917bf69079088701a0725c5fc6b554bf35 (patch) | |
| tree | d6c5666421b5efd1ef2e492c88416f07e0c8d123 | |
| parent | b994b6c0332a5499b33880855dadad04d74cde54 (diff) | |
x86: time_XX.c declare functions before they get used
Declare time_init() in asm-x86/time.h
Also did cleanup in asm-x86/timer.h :
timer_ack is only required for X86_32
int recalibrate_cpu_khz(void) is for X86_32
Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| -rw-r--r-- | arch/x86/kernel/time_32.c | 1 | ||||
| -rw-r--r-- | include/asm-x86/time.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/timer.h | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index ffe3c664afc..bbecf8b6bf9 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c @@ -36,6 +36,7 @@ #include <asm/arch_hooks.h> #include <asm/hpet.h> #include <asm/time.h> +#include <asm/timer.h> #include "do_timer.h" diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h index a17fa473e91..5f4fc3e0238 100644 --- a/include/asm-x86/time.h +++ b/include/asm-x86/time.h @@ -46,6 +46,8 @@ static inline int native_set_wallclock(unsigned long nowtime) #endif +extern void time_init(void); + #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #else /* !CONFIG_PARAVIRT */ diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h index fb2a4ddddf3..2a8a92d5787 100644 --- a/include/asm-x86/timer.h +++ b/include/asm-x86/timer.h @@ -9,9 +9,12 @@ unsigned long long native_sched_clock(void); unsigned long native_calibrate_tsc(void); +#ifdef CONFIG_X86_32 extern int timer_ack; -extern int no_timer_check; extern int recalibrate_cpu_khz(void); +#endif /* CONFIG_X86_32 */ + +extern int no_timer_check; #ifndef CONFIG_PARAVIRT #define calibrate_tsc() native_calibrate_tsc() |