linux-kernel - Re: [PATCH] x86, mce: Rename incorrect macro name "CONFIG_X86

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 22 Jul 2009 12:37:08 +0900
From:	Hidetoshi Seto <seto.hidetoshi@...fujitsu.com>
To:	Hidehiro Kawai <hidehiro.kawai.ez@...achi.com>
CC:	mingo@...e.hu, tglx@...utronix.de, hpa@...or.com,
	ak@...ux.intel.com, linux-kernel@...r.kernel.org,
	Satoshi OSHIMA <satoshi.oshima.fk@...achi.com>,
	Taketoshi Sakuraba <taketoshi.sakuraba.hc@...achi.com>
Subject: Re: [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@...achi.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@...e.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@...fujitsu.com>


Thanks,
H.Seto

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/