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

Commit 8363fc82 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by H. Peter Anvin
Browse files

x86, mce: remove intel_set_thermal_handler() 



and make intel_thermal_interrupt() static.

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 895287c0

arch/x86/include/asm/mce.h

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ extern void (*mce_threshold_vector)(void); 
 * Thermal handler

 */



void intel_set_thermal_handler(void);

void intel_init_thermal(struct cpuinfo_x86 *c);



#ifdef CONFIG_X86_NEW_MCE

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

+2 −7
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ device_initcall(thermal_throttle_init_device); 
#endif /* CONFIG_SYSFS */



/* Thermal transition interrupt handler */

void intel_thermal_interrupt(void)

static void intel_thermal_interrupt(void)

{

	__u64 msr_val;
@@ -231,11 +231,6 @@ asmlinkage void smp_thermal_interrupt(struct pt_regs *regs) 
	ack_APIC_irq();

}



void intel_set_thermal_handler(void)

{

	smp_thermal_vector = intel_thermal_interrupt;

}



void intel_init_thermal(struct cpuinfo_x86 *c)

{

	unsigned int cpu = smp_processor_id();
@@ -278,7 +273,7 @@ void intel_init_thermal(struct cpuinfo_x86 *c) 
	wrmsr(MSR_IA32_THERM_INTERRUPT,

		l | (THERM_INT_LOW_ENABLE | THERM_INT_HIGH_ENABLE), h);



	intel_set_thermal_handler();

	smp_thermal_vector = intel_thermal_interrupt;



	rdmsr(MSR_IA32_MISC_ENABLE, l, h);

	wrmsr(MSR_IA32_MISC_ENABLE, l | MSR_IA32_MISC_ENABLE_TM1, h);