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

Commit cffd377e authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Ingo Molnar
Browse files

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: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: default avatarYong Wang <yong.y.wang@linux.intel.com>
LKML-Reference: <4AFBB0B8.2070501@jp.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ce6b5d76

arch/x86/kernel/cpu/mcheck/mce.c

+2 −2
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ int mce_notify_irq(void) 
}

EXPORT_SYMBOL_GPL(mce_notify_irq);



static int mce_banks_init(void)

static int __cpuinit __mcheck_cpu_mce_banks_init(void)

{

	int i;
@@ -1242,7 +1242,7 @@ static int __cpuinit __mcheck_cpu_cap_init(void) 
	WARN_ON(banks != 0 && b != banks);

	banks = b;

	if (!mce_banks) {

		int err = mce_banks_init();

		int err = __mcheck_cpu_mce_banks_init();



		if (err)

			return err;

arch/x86/kernel/cpu/mcheck/therm_throt.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void __init mcheck_intel_therm_init(void) 
		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();

	int tm2 = 0;