diff options
author | Shaohua Li <shaohua.li@intel.com> | 2005-06-25 17:54:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:28 -0400 |
commit | a13db56624c2a9d6c0dae0a693b25b0e58de9ea3 (patch) | |
tree | ddb2a4a3c200eba0b09fee7429bf16901e1bcfe3 | |
parent | 1249c5138f573890eae0c01f13d627094edcd55c (diff) |
[PATCH] CPU hotplug: fix hpet sectioning
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>
-rw-r--r-- | arch/i386/kernel/time_hpet.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/timers/common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c index 10a0cbb88e75..658c0629ba6a 100644 --- a/arch/i386/kernel/time_hpet.c +++ b/arch/i386/kernel/time_hpet.c | |||
@@ -50,7 +50,7 @@ static void hpet_writel(unsigned long d, unsigned long a) | |||
50 | * comparator value and continue. Next tick can be caught by checking | 50 | * comparator value and continue. Next tick can be caught by checking |
51 | * for a change in the comparator value. Used in apic.c. | 51 | * for a change in the comparator value. Used in apic.c. |
52 | */ | 52 | */ |
53 | static void __init wait_hpet_tick(void) | 53 | static void __devinit wait_hpet_tick(void) |
54 | { | 54 | { |
55 | unsigned int start_cmp_val, end_cmp_val; | 55 | unsigned int start_cmp_val, end_cmp_val; |
56 | 56 | ||
diff --git a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c index 37353bd31803..8163fe0cf1f0 100644 --- a/arch/i386/kernel/timers/common.c +++ b/arch/i386/kernel/timers/common.c | |||
@@ -86,7 +86,7 @@ bad_ctc: | |||
86 | #define CALIBRATE_CNT_HPET (5 * hpet_tick) | 86 | #define CALIBRATE_CNT_HPET (5 * hpet_tick) |
87 | #define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC) | 87 | #define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC) |
88 | 88 | ||
89 | unsigned long __init calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr) | 89 | unsigned long __devinit calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr) |
90 | { | 90 | { |
91 | unsigned long tsc_startlow, tsc_starthigh; | 91 | unsigned long tsc_startlow, tsc_starthigh; |
92 | unsigned long tsc_endlow, tsc_endhigh; | 92 | unsigned long tsc_endlow, tsc_endhigh; |