Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0444c9bd authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Tighten conditionals on MCE related statistics 



irq_thermal_count is only being maintained when
X86_THERMAL_VECTOR, and both X86_THERMAL_VECTOR and
X86_MCE_THRESHOLD don't need extra wrapping in X86_MCE
conditionals.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Yong Wang <yong.y.wang@intel.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Arjan van de Ven <arjan@infradead.org>
LKML-Reference: <4B06AFA902000078000211F8@vpn.id2.novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cffd377e

arch/x86/include/asm/hardirq.h

+3 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ typedef struct { 
	unsigned int irq_call_count;

	unsigned int irq_tlb_count;

#endif

#ifdef CONFIG_X86_MCE

#ifdef CONFIG_X86_THERMAL_VECTOR

	unsigned int irq_thermal_count;

#endif

#ifdef CONFIG_X86_MCE_THRESHOLD

	unsigned int irq_threshold_count;

#endif

#endif

} ____cacheline_aligned irq_cpustat_t;



DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);

arch/x86/kernel/irq.c

+6 −6
Original line number Diff line number Diff line
@@ -92,18 +92,18 @@ static int show_other_interrupts(struct seq_file *p, int prec) 
		seq_printf(p, "%10u ", irq_stats(j)->irq_tlb_count);

	seq_printf(p, "  TLB shootdowns\n");

#endif

#ifdef CONFIG_X86_MCE

#ifdef CONFIG_X86_THERMAL_VECTOR

	seq_printf(p, "%*s: ", prec, "TRM");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->irq_thermal_count);

	seq_printf(p, "  Thermal event interrupts\n");

#endif

#ifdef CONFIG_X86_MCE_THRESHOLD

	seq_printf(p, "%*s: ", prec, "THR");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->irq_threshold_count);

	seq_printf(p, "  Threshold APIC interrupts\n");

#endif

#endif

#ifdef CONFIG_X86_MCE

	seq_printf(p, "%*s: ", prec, "MCE");

	for_each_online_cpu(j)
@@ -194,12 +194,12 @@ u64 arch_irq_stat_cpu(unsigned int cpu) 
	sum += irq_stats(cpu)->irq_call_count;

	sum += irq_stats(cpu)->irq_tlb_count;

#endif

#ifdef CONFIG_X86_MCE

#ifdef CONFIG_X86_THERMAL_VECTOR

	sum += irq_stats(cpu)->irq_thermal_count;

#endif

#ifdef CONFIG_X86_MCE_THRESHOLD

	sum += irq_stats(cpu)->irq_threshold_count;

#endif

#endif

#ifdef CONFIG_X86_MCE

	sum += per_cpu(mce_exception_count, cpu);

	sum += per_cpu(mce_poll_count, cpu);