lkml.org 
[lkml]   [2009]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86, mce: Rename incorrect macro name "CONFIG_X86_THRESHOLD"
Hidehiro Kawai wrote:
> 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>
> ---
> 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 8a194ad..ccf8ab5 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_MCE) && defined(CONFIG_X86_LOCAL_APIC)


It seems that this ifdef was introduced by the following merge commit:

> commit 940010c5a314a7bd9b498593bc6ba1718ac5aec5
> Merge: 8dc8e5e... 991ec02...
> Author: Ingo Molnar <mingo@elte.hu>
> Date: Thu Jun 11 17:55:42 2009 +0200
>
> Merge branch 'linus' into perfcounters/core
>
> Conflicts:
> arch/x86/kernel/irqinit.c
> arch/x86/kernel/irqinit_64.c
> arch/x86/kernel/traps.c
> arch/x86/mm/fault.c
> include/linux/sched.h
> kernel/exit.c

Thank you for finding it!

Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>


Thanks,
H.Seto



\
 
 \ /
  Last update: 2009-07-22 05:39    [W:0.075 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site