From: Brian Gerst <brgerst@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Tejun Heo <tj@kernel.org>,
linux-kernel@vger.kernel.org, Brian Gerst <brgerst@gmail.com>
Subject: [PATCH 5/5] x86: make irq_cpustat_t fields conditional.
Date: Thu, 22 Jan 2009 08:33:38 -0500 [thread overview]
Message-ID: <1232631218-5092-5-git-send-email-brgerst@gmail.com> (raw)
In-Reply-To: <73c1f2160901220533n53cdbb33q2eec14d47176533d@mail.gmail.com>
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/hardirq.h | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index f4a95f2..176f058 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -7,14 +7,22 @@
typedef struct {
unsigned int __softirq_pending;
unsigned int __nmi_count; /* arch dependent */
- unsigned int apic_timer_irqs; /* arch dependent */
unsigned int irq0_irqs;
+#ifdef CONFIG_X86_LOCAL_APIC
+ unsigned int apic_timer_irqs; /* arch dependent */
+ unsigned int irq_spurious_count;
+#endif
+#ifdef CONFIG_SMP
unsigned int irq_resched_count;
unsigned int irq_call_count;
unsigned int irq_tlb_count;
+#endif
+#ifdef CONFIG_X86_MCE
unsigned int irq_thermal_count;
- unsigned int irq_spurious_count;
+# ifdef CONFIG_X86_64
unsigned int irq_threshold_count;
+# endif
+#endif
} ____cacheline_aligned irq_cpustat_t;
DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
--
1.6.1
next prev parent reply other threads:[~2009-01-22 13:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-22 13:33 [PATCH 0/5] x86: Merge hardirq.h Brian Gerst
2009-01-22 13:33 ` [PATCH 1/5] x86-32: Remove idle_timestamp Brian Gerst
2009-01-22 13:33 ` [PATCH 2/5] x86-64: Remove include of apic.h from hardirq_64.h Brian Gerst
2009-01-22 13:33 ` [PATCH 3/5] x86: Sync hardirq_{32,64}.h Brian Gerst
2009-01-22 13:33 ` [PATCH 4/5] x86: Merge hardirq_{32,64}.h into hardirq.h Brian Gerst
2009-01-22 13:33 ` Brian Gerst [this message]
2009-01-23 2:09 ` [PATCH 0/5] x86: Merge hardirq.h Tejun Heo
2009-01-23 9:16 ` Ingo Molnar
2009-01-23 10:01 ` [PATCH] x86, xen: fix hardirq.h merge fallout Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1232631218-5092-5-git-send-email-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox