2008-06-16 23:00:32

by Glauber Costa

Subject: [PATCH] typo CONFIX -> CONFIG

---
arch/x86/kernel/nmi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 07cf17f..3775463 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -69,7 +69,7 @@ static inline unsigned int get_nmi_count(int cpu)

static inline int mce_in_progress(void)
{
-#if defined(CONFIX_X86_64) && defined(CONFIG_X86_MCE)
+#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE)
return atomic_read(&mce_entry) > 0;
#endif
return 0;
--
1.5.4.5

2008-06-19 09:58:59

by Ingo Molnar

Subject: Re: [PATCH] typo CONFIX -> CONFIG

* Glauber Costa <[email protected]> wrote:

> ---
> arch/x86/kernel/nmi.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
> index 07cf17f..3775463 100644
> --- a/arch/x86/kernel/nmi.c
> +++ b/arch/x86/kernel/nmi.c
> @@ -69,7 +69,7 @@ static inline unsigned int get_nmi_count(int cpu)
>
> static inline int mce_in_progress(void)
> {
> -#if defined(CONFIX_X86_64) && defined(CONFIG_X86_MCE)
> +#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE)

applied to tip/x86/nmi - thanks Glauber. [ Someone's been reading too
many Goscinny comics ;) ]

Ingo

2008-06-19 10:51:42

by Cyrill Gorcunov

Subject: Re: [PATCH] typo CONFIX -> CONFIG

On Thu, Jun 19, 2008 at 1:58 PM, Ingo Molnar <[email protected]> wrote:
>
> * Glauber Costa <[email protected]> wrote:
>
>> ---
>> arch/x86/kernel/nmi.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
>> index 07cf17f..3775463 100644
>> --- a/arch/x86/kernel/nmi.c
>> +++ b/arch/x86/kernel/nmi.c
>> @@ -69,7 +69,7 @@ static inline unsigned int get_nmi_count(int cpu)
>>
>> static inline int mce_in_progress(void)
>> {
>> -#if defined(CONFIX_X86_64) && defined(CONFIG_X86_MCE)
>> +#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE)
>
> applied to tip/x86/nmi - thanks Glauber. [ Someone's been reading too
> many Goscinny comics ;) ]
>
> Ingo
>

Oh my, thanks! (putting the comics behind the back by trying to
show that is not my fault ;-)