Message-ID: <49512BF5.2010705@kernel.org>
Date: Tue, 23 Dec 2008 10:20:37 -0800
From: "H. Peter Anvin" <hpa@kernel.org>
Organization: Linux Kernel Organization, Inc.
User-Agent: Thunderbird 2.0.0.14 (X11/20080501)
MIME-Version: 1.0
To: Jaswinder Singh <jaswinder@infradead.org>
CC: Ingo Molnar <mingo@elte.hu>, Andi Kleen <andi@firstfloor.org>,
       x86 maintainers <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] x86: traps.c replace #if CONFIG_X86_32 with #ifdef	CONFIG_X86_32
References: <1230049211.14358.2.camel@jaswinder.satnam>
In-Reply-To: <1230049211.14358.2.camel@jaswinder.satnam>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1237
Lines: 41

Jaswinder Singh wrote:
> Impact: cleanup, avoid warning in X86_64
> 
> Fixes this warning in X86_64:
>   CC      arch/x86/kernel/traps.o
> arch/x86/kernel/traps.c:695:5: warning: "CONFIG_X86_32" is not defined
> 
> Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
> ---
>  arch/x86/kernel/traps.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
> index d327b53..2c00412 100644
> --- a/arch/x86/kernel/traps.c
> +++ b/arch/x86/kernel/traps.c
> @@ -692,7 +692,7 @@ void math_error(void __user *ip)
>  
>  	err = swd & ~cwd & 0x3f;
>  
> -#if CONFIG_X86_32
> +#ifdef CONFIG_X86_32
>  	if (!err)
>  		return;
>  #endif

Applied to tip:x86/fpu, thanks.

Andi: you might have a perspective on this: in math_error() we bail out
if there is no error on i386, but not on x86-64.  I am rather assuming
that is because it simply can't happen on x86-64 (no IRQ 13 bullshit) so
it wasn't necessary?

Thanks,

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