[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>
This commit is contained in:
parent
1249c5138f
commit
a13db56624
|
@ -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
|
* comparator value and continue. Next tick can be caught by checking
|
||||||
* for a change in the comparator value. Used in apic.c.
|
* 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;
|
unsigned int start_cmp_val, end_cmp_val;
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ bad_ctc:
|
||||||
#define CALIBRATE_CNT_HPET (5 * hpet_tick)
|
#define CALIBRATE_CNT_HPET (5 * hpet_tick)
|
||||||
#define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC)
|
#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_startlow, tsc_starthigh;
|
||||||
unsigned long tsc_endlow, tsc_endhigh;
|
unsigned long tsc_endlow, tsc_endhigh;
|
||||||
|
|
Loading…
Reference in a new issue