Messages in this thread Patch in this message | | | Date | Wed, 22 Jul 2009 05:25:10 GMT | From | tip-bot for Hidehiro Kawai <> | Subject | [tip:x86/urgent] x86, mce: Rename incorrect macro name "CONFIG_X86_THRESHOLD" |
| |
Commit-ID: 6effa8f6fc786f00e3a23eae605e0f2e8e748faa Gitweb: http://git.kernel.org/tip/6effa8f6fc786f00e3a23eae605e0f2e8e748faa Author: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> AuthorDate: Wed, 22 Jul 2009 11:56:20 +0900 Committer: H. Peter Anvin <hpa@zytor.com> CommitDate: Tue, 21 Jul 2009 21:43:22 -0700
x86, mce: Rename incorrect macro name "CONFIG_X86_THRESHOLD"
CONFIG_X86_THRESHOLD used in arch/x86/kernel/irqinit.c is always undefined. Rename it to the correct name "CONFIG_X86_MCE_THRESHOLD".
Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Cc: Andi Kleen <andi@firstfloor.org> LKML-Reference: <4A667FD4.3010509@hitachi.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
--- arch/x86/kernel/irqinit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 696f0e4..92b7703 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -187,7 +187,7 @@ static void __init apic_intr_init(void) #ifdef CONFIG_X86_THERMAL_VECTOR alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); #endif -#ifdef CONFIG_X86_THRESHOLD +#ifdef CONFIG_X86_MCE_THRESHOLD alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); #endif #if defined(CONFIG_X86_NEW_MCE) && defined(CONFIG_X86_LOCAL_APIC)
| |