typo CONFIX -> CONFIG
PATCH 1/1 typo CONFIX -> CONFIG
--- arch/x86/kernel/nmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/nmi.c +1 -1
@@ -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 ;
Signature · 1 line
1.5.4.5
Ingo Molnar
AppliedQuoted 9 lines · Glauber Costa
--- arch/x86/kernel/nmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/kernel/nmi.c +0
-0
arch/x86/kernel/nmi.c static inline unsigned int get_nmi_count(int cpu) · line 72
Quoted 5 lines
arch/x86/kernel/nmi.c +1
-1@@ -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
Quoted 21 lines · Ingo Molnar
Quoted 9 lines · Glauber Costa
--- arch/x86/kernel/nmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/kernel/nmi.c +0
-0arch/x86/kernel/nmi.c static inline unsigned int get_nmi_count(int cpu) · line 72
Quoted 5 lines
arch/x86/kernel/nmi.c +1
-1@@ -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 ;) ]
Quoted 2 lines
Ingo
Oh my, thanks! (putting the comics behind the back by trying to show that is not my fault ;-)