From 914436d5d59ebe40576381cac694e1f99570e3f1 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh <jaswinder@infradead.org>
Date: Mon, 21 Jul 2008 21:52:51 +0530
Subject: [PATCH] --- yaml --- r: 110287 b: refs/heads/master c:
 cc0384917bf69079088701a0725c5fc6b554bf35 h: refs/heads/master i:   110285:
 5757948cc03e681daa165cec16a12ef88d207e98   110283:
 202f16e5607fe633f7922f690b3ff4cb09a87926   110279:
 3065cfa6738c21d96d6fbadaf06c94fc5e95c2f7   110271:
 eec34fd1ab5f6a8c62007c7f15712be01a9e8261 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/time_32.c | 1 +
 trunk/include/asm-x86/time.h    | 2 ++
 trunk/include/asm-x86/timer.h   | 5 ++++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3e37ad79fddc..623291bbb172 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b994b6c0332a5499b33880855dadad04d74cde54
+refs/heads/master: cc0384917bf69079088701a0725c5fc6b554bf35
diff --git a/trunk/arch/x86/kernel/time_32.c b/trunk/arch/x86/kernel/time_32.c
index ffe3c664afc0..bbecf8b6bf96 100644
--- a/trunk/arch/x86/kernel/time_32.c
+++ b/trunk/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/trunk/include/asm-x86/time.h b/trunk/include/asm-x86/time.h
index a17fa473e91d..5f4fc3e02387 100644
--- a/trunk/include/asm-x86/time.h
+++ b/trunk/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/trunk/include/asm-x86/timer.h b/trunk/include/asm-x86/timer.h
index fb2a4ddddf3d..2a8a92d5787b 100644
--- a/trunk/include/asm-x86/timer.h
+++ b/trunk/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()