aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorJaswinder Singh <jaswinder@infradead.org>2008-07-21 12:22:51 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-22 08:36:01 -0400
commitcc0384917bf69079088701a0725c5fc6b554bf35 (patch)
treed6c5666421b5efd1ef2e492c88416f07e0c8d123 /include/asm-x86
parentb994b6c0332a5499b33880855dadad04d74cde54 (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>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/time.h2
-rw-r--r--include/asm-x86/timer.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index a17fa473e91d..5f4fc3e02387 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)
46 46
47#endif 47#endif
48 48
49extern void time_init(void);
50
49#ifdef CONFIG_PARAVIRT 51#ifdef CONFIG_PARAVIRT
50#include <asm/paravirt.h> 52#include <asm/paravirt.h>
51#else /* !CONFIG_PARAVIRT */ 53#else /* !CONFIG_PARAVIRT */
diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h
index fb2a4ddddf3d..2a8a92d5787b 100644
--- a/include/asm-x86/timer.h
+++ b/include/asm-x86/timer.h
@@ -9,9 +9,12 @@
9unsigned long long native_sched_clock(void); 9unsigned long long native_sched_clock(void);
10unsigned long native_calibrate_tsc(void); 10unsigned long native_calibrate_tsc(void);
11 11
12#ifdef CONFIG_X86_32
12extern int timer_ack; 13extern int timer_ack;
13extern int no_timer_check;
14extern int recalibrate_cpu_khz(void); 14extern int recalibrate_cpu_khz(void);
15#endif /* CONFIG_X86_32 */
16
17extern int no_timer_check;
15 18
16#ifndef CONFIG_PARAVIRT 19#ifndef CONFIG_PARAVIRT
17#define calibrate_tsc() native_calibrate_tsc() 20#define calibrate_tsc() native_calibrate_tsc()