* [PATCH] typo CONFIX -> CONFIG
@ 2008-06-16 22:59 Glauber Costa
2008-06-19 9:58 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Glauber Costa @ 2008-06-16 22:59 UTC (permalink / raw)
To: linux-kernel; +Cc: tglx, mingo
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] typo CONFIX -> CONFIG
2008-06-16 22:59 [PATCH] typo CONFIX -> CONFIG Glauber Costa
@ 2008-06-19 9:58 ` Ingo Molnar
2008-06-19 10:51 ` Cyrill Gorcunov
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2008-06-19 9:58 UTC (permalink / raw)
To: Glauber Costa; +Cc: linux-kernel, tglx, Cyrill Gorcunov
* Glauber Costa <gcosta@redhat.com> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] typo CONFIX -> CONFIG
2008-06-19 9:58 ` Ingo Molnar
@ 2008-06-19 10:51 ` Cyrill Gorcunov
0 siblings, 0 replies; 3+ messages in thread
From: Cyrill Gorcunov @ 2008-06-19 10:51 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Glauber Costa, linux-kernel, tglx
On Thu, Jun 19, 2008 at 1:58 PM, Ingo Molnar <mingo@elte.hu> wrote:
>
> * Glauber Costa <gcosta@redhat.com> 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 ;-)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-19 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-16 22:59 [PATCH] typo CONFIX -> CONFIG Glauber Costa
2008-06-19 9:58 ` Ingo Molnar
2008-06-19 10:51 ` Cyrill Gorcunov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®