projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'siginfo-si_trapno-for-v5.15' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
cpu
/
mce
/
core.c
diff --git
a/arch/x86/kernel/cpu/mce/core.c
b/arch/x86/kernel/cpu/mce/core.c
index
22791aa
..
8cb7816
100644
(file)
--- a/
arch/x86/kernel/cpu/mce/core.c
+++ b/
arch/x86/kernel/cpu/mce/core.c
@@
-817,7
+817,10
@@
log_it:
if (mca_cfg.dont_log_ce && !mce_usable_address(&m))
goto clear_it;
if (mca_cfg.dont_log_ce && !mce_usable_address(&m))
goto clear_it;
- mce_log(&m);
+ if (flags & MCP_QUEUE_LOG)
+ mce_gen_pool_add(&m);
+ else
+ mce_log(&m);
clear_it:
/*
clear_it:
/*
@@
-1639,10
+1642,12
@@
static void __mcheck_cpu_init_generic(void)
m_fl = MCP_DONTLOG;
/*
m_fl = MCP_DONTLOG;
/*
- * Log the machine checks left over from the previous reset.
+ * Log the machine checks left over from the previous reset. Log them
+ * only, do not start processing them. That will happen in mcheck_late_init()
+ * when all consumers have been registered on the notifier chain.
*/
bitmap_fill(all_banks, MAX_NR_BANKS);
*/
bitmap_fill(all_banks, MAX_NR_BANKS);
- machine_check_poll(MCP_UC | m_fl, &all_banks);
+ machine_check_poll(MCP_UC |
MCP_QUEUE_LOG |
m_fl, &all_banks);
cr4_set_bits(X86_CR4_MCE);
cr4_set_bits(X86_CR4_MCE);