From 864c80ebc141b61e9336c0a2a5d1f63d0259a124 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Sat, 25 Jun 2005 14:54:48 -0700
Subject: [PATCH] --- yaml --- r: 3227 b: refs/heads/master c:
 a13db56624c2a9d6c0dae0a693b25b0e58de9ea3 h: refs/heads/master i:   3225:
 3b8311c2c8fe891c7d9bd4d6222224fdfdb93fe6   3223:
 ba50b04a68a4db24cbb085e2c47ca06051ed16a6 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/i386/kernel/time_hpet.c     | 2 +-
 trunk/arch/i386/kernel/timers/common.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 423267a16408..0961d3a5704e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1249c5138f573890eae0c01f13d627094edcd55c
+refs/heads/master: a13db56624c2a9d6c0dae0a693b25b0e58de9ea3
diff --git a/trunk/arch/i386/kernel/time_hpet.c b/trunk/arch/i386/kernel/time_hpet.c
index 10a0cbb88e75..658c0629ba6a 100644
--- a/trunk/arch/i386/kernel/time_hpet.c
+++ b/trunk/arch/i386/kernel/time_hpet.c
@@ -50,7 +50,7 @@ static void hpet_writel(unsigned long d, unsigned long a)
  * comparator value and continue. Next tick can be caught by checking
  * for a change in the comparator value. Used in apic.c.
  */
-static void __init wait_hpet_tick(void)
+static void __devinit wait_hpet_tick(void)
 {
 	unsigned int start_cmp_val, end_cmp_val;
 
diff --git a/trunk/arch/i386/kernel/timers/common.c b/trunk/arch/i386/kernel/timers/common.c
index 37353bd31803..8163fe0cf1f0 100644
--- a/trunk/arch/i386/kernel/timers/common.c
+++ b/trunk/arch/i386/kernel/timers/common.c
@@ -86,7 +86,7 @@ unsigned long calibrate_tsc(void)
 #define CALIBRATE_CNT_HPET 	(5 * hpet_tick)
 #define CALIBRATE_TIME_HPET 	(5 * KERNEL_TICK_USEC)
 
-unsigned long __init calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr)
+unsigned long __devinit calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr)
 {
 	unsigned long tsc_startlow, tsc_starthigh;
 	unsigned long tsc_endlow, tsc_endhigh;