]> err.no Git - linux-2.6/commitdiff
[PATCH] CPU hotplug: fix hpet sectioning
authorShaohua Li <shaohua.li@intel.com>
Sat, 25 Jun 2005 21:54:48 +0000 (14:54 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 25 Jun 2005 23:24:28 +0000 (16:24 -0700)
With hpet enabled, cpu hotplug uses some routines marked with __init.

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/time_hpet.c
arch/i386/kernel/timers/common.c

index 10a0cbb88e754e81cb01604bca90e989c5b9d50c..658c0629ba6aa9e9d2062cd9111ba14a3b888e0c 100644 (file)
@@ -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;
 
index 37353bd318036f4f6d0dc4d00c5f1a7ea9c973e1..8163fe0cf1f0333dc59935ec5e4032aa8bab7a7a 100644 (file)
@@ -86,7 +86,7 @@ bad_ctc:
 #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;