summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLi Fei <fei.li@intel.com>2013-04-26 20:50:11 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-07 19:57:27 -0700
commite34eca4c2d2f1783c94fad22d72ebb304c3f0728 (patch)
tree0fc72c3a90992dff5866e595f5a942c036ccf6e7 /arch
parent8b715460ae5db65f37aefdd3d1330189e193f789 (diff)
downloadlinux-stable-e34eca4c2d2f1783c94fad22d72ebb304c3f0728.tar.gz
linux-stable-e34eca4c2d2f1783c94fad22d72ebb304c3f0728.tar.bz2
linux-stable-e34eca4c2d2f1783c94fad22d72ebb304c3f0728.zip
x86: Eliminate irq_mis_count counted in arch_irq_stat
commit f7b0e1055574ce06ab53391263b4e205bf38daf3 upstream. With the current implementation, kstat_cpu(cpu).irqs_sum is also increased in case of irq_mis_count increment. So there is no need to count irq_mis_count in arch_irq_stat, otherwise irq_mis_count will be counted twice in the sum of /proc/stat. Reported-by: Liu Chuansheng <chuansheng.liu@intel.com> Signed-off-by: Li Fei <fei.li@intel.com> Acked-by: Liu Chuansheng <chuansheng.liu@intel.com> Cc: tomoki.sekiyama.qu@hitachi.com Cc: joe@perches.com Link: http://lkml.kernel.org/r/1366980611.32469.7.camel@fli24-HP-Compaq-8100-Elite-CMT-PC Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/irq.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 6c0802eb2f7f..a669961bb152 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -159,10 +159,6 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
u64 arch_irq_stat(void)
{
u64 sum = atomic_read(&irq_err_count);
-
-#ifdef CONFIG_X86_IO_APIC
- sum += atomic_read(&irq_mis_count);
-#endif
return sum;
}