diff options
| author |   Vegard Nossum <vegard.nossum@gmail.com> | 2009-02-20 11:56:38 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-02-20 12:07:43 +0100 |
| commit | ecab22aa6dc9d42ca52de2cad0854b4c6bd85ac9 (patch) | |
| tree | cc9e8fbe1a6106a7298b8107293ff385e38a40fc /arch/x86/kernel/cpu/mcheck/p4.c | |
| parent | x86: syscalls.h: remove asmlinkage from declaration of sys_rt_sigreturn() (diff) | |
| download | linux-dev-ecab22aa6dc9d42ca52de2cad0854b4c6bd85ac9.tar.xz linux-dev-ecab22aa6dc9d42ca52de2cad0854b4c6bd85ac9.zip | |
x86: use symbolic constants for MSR_IA32_MISC_ENABLE bits
Impact: Cleanup. No functional changes.
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/p4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index 9b60fce09f75..f53bdcbaf382 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c @@ -85,7 +85,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) */ rdmsr(MSR_IA32_MISC_ENABLE, l, h); h = apic_read(APIC_LVTTHMR); - if ((l & (1<<3)) && (h & APIC_DM_SMI)) { + if ((l & MSR_IA32_MISC_ENABLE_TM1) && (h & APIC_DM_SMI)) { printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", cpu); return; /* -EBUSY */ @@ -111,7 +111,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) vendor_thermal_interrupt = intel_thermal_interrupt; rdmsr(MSR_IA32_MISC_ENABLE, l, h); - wrmsr(MSR_IA32_MISC_ENABLE, l | (1<<3), h); + wrmsr(MSR_IA32_MISC_ENABLE, l | MSR_IA32_MISC_ENABLE_TM1, h); l = apic_read(APIC_LVTTHMR); apic_write(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); |