diff options
| author | Andi Kleen <andi@firstfloor.org> | 2009-02-12 13:39:35 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-18 00:24:34 +0100 |
| commit | 07db1c140eb233971341396e492cc73d4280e698 (patch) | |
| tree | 52fc67a4724ca6cbfde88b2e8a64746479da6d29 /arch | |
| parent | x86, mce: use force_sig_info to kill process in machine check (diff) | |
| download | linux-07db1c140eb233971341396e492cc73d4280e698.tar.xz linux-07db1c140eb233971341396e492cc73d4280e698.zip | |
x86, mce: fix ifdef for 64bit thermal apic vector clear on shutdown
Impact: Bugfix
The ifdef for the apic clear on shutdown for the 64bit intel thermal
vector was incorrect and never triggered. Fix that.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 115449f869ee..570f36e44e59 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -862,7 +862,7 @@ void clear_local_APIC(void) } /* lets not touch this if we didn't frob it */ -#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL) +#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL) if (maxlvt >= 5) { v = apic_read(APIC_LVTTHMR); apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED); |