summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/time_hpet.c
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2005-06-25 23:54:48 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-26 01:24:28 +0200
commita13db56624c2a9d6c0dae0a693b25b0e58de9ea3 (patch)
treeddb2a4a3c200eba0b09fee7429bf16901e1bcfe3 /arch/i386/kernel/time_hpet.c
parent[PATCH] dmi: spring cleanup (diff)
downloadlinux-a13db56624c2a9d6c0dae0a693b25b0e58de9ea3.tar.xz
linux-a13db56624c2a9d6c0dae0a693b25b0e58de9ea3.zip
[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>
Diffstat (limited to 'arch/i386/kernel/time_hpet.c')
-rw-r--r--arch/i386/kernel/time_hpet.c2
1 files changed, 1 insertions, 1 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)
* 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;