diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-16 15:14:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-16 15:14:40 +1100 |
| commit | 754e14bd95f336cb2a50c961db6d1ebd311e430c (patch) | |
| tree | f027240121cd0f666343f8989d7473a660fb241e /arch/x86/kernel/cpu/mcheck/mce.c | |
| parent | d8f9f3a5723cda1adac1a61a91a76b47449fa3d7 (diff) | |
| parent | d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 (diff) | |
Merge remote branch 'i7core_edac/linux_next'
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index a8aacd4b513c..2e4c9f73821b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -35,6 +35,7 @@ #include <linux/fs.h> #include <linux/mm.h> #include <linux/debugfs.h> +#include <linux/edac_mce.h> #include <asm/processor.h> #include <asm/hw_irq.h> @@ -161,6 +162,15 @@ void mce_log(struct mce *mce) entry = rcu_dereference(mcelog.next); for (;;) { /* + * If edac_mce is enabled, it will check the error type + * and will process it, if it is a known error. + * Otherwise, the error will be sent through mcelog + * interface + */ + if (edac_mce_parse(mce)) + return; + + /* * When the buffer fills up discard new entries. * Assume that the earlier errors are the more * interesting ones: |