summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/hardirq.h
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2009-11-20 17:03:05 +0300
committerIngo Molnar <mingo@elte.hu>2009-11-23 21:40:06 +0300
commit0444c9bd0cf4e0eb946a7fcaf34765accfa9404a (patch)
tree0924179537bcacfb920fe2a62c8a40aaf4319ef0 /arch/x86/include/asm/hardirq.h
parentcffd377e5879ea58522224a785a083f201afd80e (diff)
downloadlinux-0444c9bd0cf4e0eb946a7fcaf34765accfa9404a.tar.xz
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: Jan 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: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/hardirq.h')
-rw-r--r--arch/x86/include/asm/hardirq.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 82e3e8f01043..108eb6fd1ae7 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -20,11 +20,11 @@ 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;
-# ifdef CONFIG_X86_MCE_THRESHOLD
+#endif
+#ifdef CONFIG_X86_MCE_THRESHOLD
unsigned int irq_threshold_count;
-# endif
#endif
} ____cacheline_aligned irq_cpustat_t;