diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-07 15:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-07 15:35:27 +0200 |
| commit | c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 (patch) | |
| tree | 142041dd61132d487c2afddc8db32b350ee181ee /arch/x86/kernel/irq.c | |
| parent | c8e56d20f2d190d54c0615775dcb6a23c1091681 (diff) | |
| parent | 243d657eaf540db882f73497060da5a4f7d86a90 (diff) | |
Merge branch 'x86/ras' into x86/core, to fix conflicts
Conflicts:
arch/x86/include/asm/irq_vectors.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/irq.c')
| -rw-r--r-- | arch/x86/kernel/irq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 7e10c8b4b318..88b366487b0e 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -122,6 +122,12 @@ int arch_show_interrupts(struct seq_file *p, int prec) seq_printf(p, "%10u ", irq_stats(j)->irq_threshold_count); seq_puts(p, " Threshold APIC interrupts\n"); #endif +#ifdef CONFIG_X86_MCE_AMD + seq_printf(p, "%*s: ", prec, "DFR"); + for_each_online_cpu(j) + seq_printf(p, "%10u ", irq_stats(j)->irq_deferred_error_count); + seq_puts(p, " Deferred Error APIC interrupts\n"); +#endif #ifdef CONFIG_X86_MCE seq_printf(p, "%*s: ", prec, "MCE"); for_each_online_cpu(j) |