mirror of
https://github.com/torvalds/linux
synced 2024-09-27 15:00:46 +00:00
x86, mce: Fix __init annotations
The intel_init_thermal() is called from resume path, so it cannot be marked as __init. OTOH mce_banks_init() is only called from __mcheck_cpu_cap_init() which is marked as __cpuinit, so it can be also marked as __cpuinit. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Acked-by: Yong Wang <yong.y.wang@linux.intel.com> LKML-Reference: <4AFBB0B8.2070501@jp.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
ce6b5d768c
commit
cffd377e58
|
@ -1201,7 +1201,7 @@ int mce_notify_irq(void)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(mce_notify_irq);
|
EXPORT_SYMBOL_GPL(mce_notify_irq);
|
||||||
|
|
||||||
static int mce_banks_init(void)
|
static int __cpuinit __mcheck_cpu_mce_banks_init(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -1242,7 +1242,7 @@ static int __cpuinit __mcheck_cpu_cap_init(void)
|
||||||
WARN_ON(banks != 0 && b != banks);
|
WARN_ON(banks != 0 && b != banks);
|
||||||
banks = b;
|
banks = b;
|
||||||
if (!mce_banks) {
|
if (!mce_banks) {
|
||||||
int err = mce_banks_init();
|
int err = __mcheck_cpu_mce_banks_init();
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
|
@ -268,7 +268,7 @@ void __init mcheck_intel_therm_init(void)
|
||||||
lvtthmr_init = apic_read(APIC_LVTTHMR);
|
lvtthmr_init = apic_read(APIC_LVTTHMR);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init intel_init_thermal(struct cpuinfo_x86 *c)
|
void intel_init_thermal(struct cpuinfo_x86 *c)
|
||||||
{
|
{
|
||||||
unsigned int cpu = smp_processor_id();
|
unsigned int cpu = smp_processor_id();
|
||||||
int tm2 = 0;
|
int tm2 = 0;
|
||||||
|
|
Loading…
Reference in a new issue