summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/apic.h
diff options
context:
space:
mode:
authorFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>2011-12-15 03:32:24 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-18 10:46:48 +0100
commitb49d7d877ff96428c8cd2076b33ba72bf85ceaba (patch)
tree7c0a4983a44bb70710e1efb501f0dcf21266f554 /arch/x86/include/asm/apic.h
parentx86: Add per-cpu stat counter for APIC ICR read tries (diff)
downloadlinux-b49d7d877ff96428c8cd2076b33ba72bf85ceaba.tar.xz
linux-b49d7d877ff96428c8cd2076b33ba72bf85ceaba.zip
x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat
LAPIC related statistics are grouped inside the per-cpu structure irq_stat, so there is no need for icr_read_retry_count to be a standalone per-cpu variable. This patch moves icr_read_retry_count to where it belongs. Suggested-y: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Cc: Jörn Engel <joern@logfs.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r--arch/x86/include/asm/apic.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 5fe0bd574756..a0f541a30944 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -411,8 +411,6 @@ extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
#ifdef CONFIG_X86_LOCAL_APIC
-DECLARE_PER_CPU(unsigned, icr_read_retry_count);
-
static inline u32 apic_read(u32 reg)
{
return apic->read(reg);