projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[deliverable/linux.git]
/
arch
/
x86
/
kernel
/
apic
/
nmi.c
diff --git
a/arch/x86/kernel/apic/nmi.c
b/arch/x86/kernel/apic/nmi.c
index db7220220d0927bb2756f5effd6da5aa539cd8b5..cb66a22d98ad72a3ad9eae5fc5b606beb15bcb94 100644
(file)
--- a/
arch/x86/kernel/apic/nmi.c
+++ b/
arch/x86/kernel/apic/nmi.c
@@
-66,7
+66,7
@@
static inline unsigned int get_nmi_count(int cpu)
static inline int mce_in_progress(void)
{
-#if defined(CONFIG_X86_
NEW_
MCE)
+#if defined(CONFIG_X86_MCE)
return atomic_read(&mce_entry) > 0;
#endif
return 0;
This page took
0.033018 seconds
and
5
git commands to generate.