x86: irq.c keep CONFIG_X86_LOCAL_APIC interrupts together
PATCH 2/2 x86: irq.c keep CONFIG_X86_LOCAL_APIC interrupts together
This is the incremental patch of :
[PATCH -tip] x86: irq.c use same path for show_interrupts
From: Jaswinder Singh Rajput <[email protected]>
Date: Sun, 22 Mar 2009 16:10:09 +0530
Subject: [PATCH] x86: irq.c keep CONFIG_X86_LOCAL_APIC interrupts together
Impact: cleanup
keep CONFIG_X86_LOCAL_APIC interrupts together to avoid extra ifdef
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/kernel/irq.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/kernel/irq.c +6 -9
@@ -58,6 +58,11 @@ static int show_other_interrupts(struct seq_file *p, int prec)for_each_online_cpu (j)seq_printf (p,"%10u " ,irq_stats (j)->apic_timer_irqs);seq_printf (p," Local timer interrupts\n" ); + +seq_printf (p,"%*s: " , prec,"SPU" ); +for_each_online_cpu (j) +seq_printf (p,"%10u " ,irq_stats (j)->irq_spurious_count); +seq_printf (p," Spurious interrupts\n" );#endif if (generic_interrupt_extension) {seq_printf (p,"PLT: " );
@@ -91,12 +96,6 @@ static int show_other_interrupts(struct seq_file *p, int prec)seq_printf (p," Threshold APIC interrupts\n" );# endif #endif -#ifdef CONFIG_X86_LOCAL_APIC -seq_printf (p,"%*s: " , prec,"SPU" ); -for_each_online_cpu (j) -seq_printf (p,"%10u " ,irq_stats (j)->irq_spurious_count); -seq_printf (p," Spurious interrupts\n" ); -#endif seq_printf (p,"%*s: %10u\n" , prec,"ERR" ,atomic_read (&irq_err_count));#if defined(CONFIG_X86_IO_APIC )seq_printf (p,"%*s: %10u\n" , prec,"MIS" ,atomic_read (&irq_mis_count));
@@ -166,6 +165,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)#ifdef CONFIG_X86_LOCAL_APIC sum +=irq_stats (cpu)->apic_timer_irqs; + sum +=irq_stats (cpu)->irq_spurious_count;#endif if (generic_interrupt_extension) sum +=irq_stats (cpu)->generic_irqs;
@@ -180,9 +180,6 @@ u64 arch_irq_stat_cpu(unsigned int cpu) sum +=irq_stats (cpu)->irq_threshold_count;#endif #endif -#ifdef CONFIG_X86_LOCAL_APIC - sum +=irq_stats (cpu)->irq_spurious_count; -#endif return sum; }
Signature · 1 line
1.6.0.6