x86, mce: Introduce intel_thermal_supported()
PATCH 2/2 x86, mce: Introduce intel_thermal_supported()
It looks better to have a common function.
Signed-off-by Hidetoshi Seto <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
--- arch/x86/kernel/cpu/mcheck/therm_throt.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mcheck/therm_throt.c +12 -5
@@ -256,6 +256,16 @@ asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)ack_APIC_irq (); } +/* Thermal monitoring depends on APIC, ACPI and clock modulation */ +static int intel_thermal_supported (struct cpuinfo_x86 *c) +{ +if (!cpu_has_apic) +return 0 ; +if (!cpu_has (c,X86_FEATURE_ACPI ) || !cpu_has (c,X86_FEATURE_ACC )) +return 0 ; +return 1 ; +} +void __init mcheck_intel_therm_init (void ) {/*
@@ -263,8 +273,7 @@ void __init mcheck_intel_therm_init(void)* LVT value on BSP and use that value to restore APs' thermal LVT * entry BIOS programmed later */ -if (cpu_has (&boot_cpu_data,X86_FEATURE_ACPI ) && -cpu_has (&boot_cpu_data,X86_FEATURE_ACC )) +if (intel_thermal_supported (&boot_cpu_data)) lvtthmr_init =apic_read (APIC_LVTTHMR ); }
@@ -274,9 +283,7 @@ void intel_init_thermal(struct cpuinfo_x86 *c)int tm2 =0 ;u32 l, h; -/* Thermal monitoring depends on APIC, ACPI and clock modulation */ -if (!cpu_has_apic || !cpu_has (c,X86_FEATURE_ACPI ) || - !cpu_has (c,X86_FEATURE_ACC )) +if (!intel_thermal_supported (c))return ;/*
Signature · 1 line
1.6.5.6
Ingo Molnar
AppliedQuoted 7 lines · Hidetoshi Seto
It looks better to have a common function.
Signed-off-by Hidetoshi Seto <[email protected]>Cc Cyrill Gorcunov <[email protected]>--- arch/x86/kernel/cpu/mcheck/therm_throt.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-)
Applied both patches, thanks!
Ingo
[tip:x86/urgent] x86, mce: Clean up thermal init by introducing intel_thermal_supported()
In reply to Hidetoshi SetoCommit-ID: 70fe440718d9f42bf963c2cffe12008eb5556165 Gitweb: http://git.kernel.org/tip/70fe440718d9f42bf963c2cffe12008eb5556165 Author: Hidetoshi Seto <[email protected]> AuthorDate: Mon, 14 Dec 2009 17:57:00 +0900 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 14 Dec 2009 10:38:41 +0100
x86, mce: Clean up thermal init by introducing intel_thermal_supported()
It looks better to have a common function. No change in functionality.
Signed-off-by Hidetoshi Seto <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
--- arch/x86/kernel/cpu/mcheck/therm_throt.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/mcheck/therm_throt.c +12 -5
@@ -256,6 +256,16 @@ asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)ack_APIC_irq (); } +/* Thermal monitoring depends on APIC, ACPI and clock modulation */ +static int intel_thermal_supported (struct cpuinfo_x86 *c) +{ +if (!cpu_has_apic) +return 0 ; +if (!cpu_has (c,X86_FEATURE_ACPI ) || !cpu_has (c,X86_FEATURE_ACC )) +return 0 ; +return 1 ; +} +void __init mcheck_intel_therm_init (void ) {/*
@@ -263,8 +273,7 @@ void __init mcheck_intel_therm_init(void)* LVT value on BSP and use that value to restore APs' thermal LVT * entry BIOS programmed later */ -if (cpu_has (&boot_cpu_data,X86_FEATURE_ACPI ) && -cpu_has (&boot_cpu_data,X86_FEATURE_ACC )) +if (intel_thermal_supported (&boot_cpu_data)) lvtthmr_init =apic_read (APIC_LVTTHMR ); }
@@ -274,9 +283,7 @@ void intel_init_thermal(struct cpuinfo_x86 *c)int tm2 =0 ;u32 l, h; -/* Thermal monitoring depends on APIC, ACPI and clock modulation */ -if (!cpu_has_apic || !cpu_has (c,X86_FEATURE_ACPI ) || - !cpu_has (c,X86_FEATURE_ACC )) +if (!intel_thermal_supported (c))return ;/*