Trival patch: CPU hotplug some HPET routines

[Shaohua Li]

Hi,
This is a trival patch. With hpet enabled, cpu hotplug uses some
routines marked with __init.

Signed-off-by: Shaohua Li<shaohua.li@xxxxxxxxx>

---

 linux-2.6.12-mm1-root/arch/i386/kernel/time_hpet.c     |    2 +-
 linux-2.6.12-mm1-root/arch/i386/kernel/timers/common.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/time_hpet.c~timer_initcall_cleanup arch/i386/kernel/time_hpet.c
--- linux-2.6.12-mm1/arch/i386/kernel/time_hpet.c~timer_initcall_cleanup	2005-06-23 10:58:20.000000000 +0800
+++ linux-2.6.12-mm1-root/arch/i386/kernel/time_hpet.c	2005-06-23 10:58:20.000000000 +0800
@@ -50,7 +50,7 @@ static void hpet_writel(unsigned long d,
  * 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 -puN arch/i386/kernel/timers/common.c~timer_initcall_cleanup arch/i386/kernel/timers/common.c
--- linux-2.6.12-mm1/arch/i386/kernel/timers/common.c~timer_initcall_cleanup	2005-06-23 10:58:20.000000000 +0800
+++ linux-2.6.12-mm1-root/arch/i386/kernel/timers/common.c	2005-06-23 10:58:20.000000000 +0800
@@ -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;
_


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/