Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a13db566 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

[PATCH] CPU hotplug: fix hpet sectioning 



With hpet enabled, cpu hotplug uses some routines marked with __init.

Signed-off-by: default avatarShaohua <Li&lt;shaohua.li@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1249c513

arch/i386/kernel/time_hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/i386/kernel/timers/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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;