x86: hardirq: use inc_irq_stat() in non-unified functions

PATCH Applied Hiroshi Shimamoto 2 participants 2 messages Dec 12, 2008 – Dec 16, 2008 x86

lore

Share & tools

lore

Hiroshi Shimamoto

author

2008-12-12 23:52 UTC #0 lore raw

PATCH 1/1 x86: hardirq: use inc_irq_stat() in non-unified functions

From: Hiroshi Shimamoto <[email protected]>

Impact: cleanup

Replace incrementing irq stat with inc_irq_stat() in non-unified functions.

Signed-off-by Hiroshi Shimamoto <[email protected]>

---
 arch/x86/kernel/cpu/mcheck/mce_amd_64.c   |    2 +-
 arch/x86/kernel/cpu/mcheck/mce_intel_64.c |    2 +-
 arch/x86/kernel/time_32.c                 |    2 +-
 arch/x86/kernel/time_64.c                 |    2 +-
 arch/x86/kernel/tlb_32.c                  |    2 +-
 arch/x86/kernel/tlb_64.c                  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

arch/x86/kernel/cpu/mcheck/mce_amd_64.c +1 -1

index 5eb390a..748c8f9 100644
@@ -237,7 +237,7 @@ asmlinkage void mce_threshold_interrupt(void)
 		}
 	}
 out:
-	add_pda(irq_threshold_count, 1);
+	inc_irq_stat(irq_threshold_count);
 	irq_exit();
 }

arch/x86/kernel/cpu/mcheck/mce_intel_64.c +1 -1

index c17eaf5..4b48f25 100644
@@ -26,7 +26,7 @@ asmlinkage void smp_thermal_interrupt(void)
 	if (therm_throt_process(msr_val & 1))
 		mce_log_therm_throt_event(smp_processor_id(), msr_val);
 
-	add_pda(irq_thermal_count, 1);
+	inc_irq_stat(irq_thermal_count);
 	irq_exit();
 }

arch/x86/kernel/time_32.c +1 -1

index 77b400f..65309e4 100644
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(profile_pc);
 irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
 	/* Keep nmi watchdog up to date */
-	per_cpu(irq_stat, smp_processor_id()).irq0_irqs++;
+	inc_irq_stat(irq0_irqs);
 
 #ifdef CONFIG_X86_IO_APIC
 	if (timer_ack) {

arch/x86/kernel/time_64.c +1 -1

index 418a095..1749cac 100644
@@ -51,7 +51,7 @@ EXPORT_SYMBOL(profile_pc);
 
 irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
-	add_pda(irq0_irqs, 1);
+	inc_irq_stat(irq0_irqs);
 
 	global_clock_event->event_handler(global_clock_event);

arch/x86/kernel/tlb_32.c +1 -1

index f4049f3..f374f83 100644
@@ -119,7 +119,7 @@ void smp_invalidate_interrupt(struct pt_regs *regs)
 	smp_mb__after_clear_bit();
 out:
 	put_cpu_no_resched();
-	__get_cpu_var(irq_stat).irq_tlb_count++;
+	inc_irq_stat(irq_tlb_count);
 }
 
 void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,

arch/x86/kernel/tlb_64.c +1 -1

index 8f919ca..29887d7 100644
@@ -154,7 +154,7 @@ asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
 out:
 	ack_APIC_irq();
 	cpu_clear(cpu, f->flush_cpumask);
-	add_pda(irq_tlb_count, 1);
+	inc_irq_stat(irq_tlb_count);
 }
 
 void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,

Signature · 1 line

1.6.0.4

Ingo Molnar

Applied

2008-12-16 21:30 UTC #1 lore raw

Quoted 7 lines · Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
Replace incrementing irq stat with inc_irq_stat() in non-unified functions.
Signed-off-by Hiroshi Shimamoto <[email protected]>

Quoted 8 lines

---
 arch/x86/kernel/cpu/mcheck/mce_amd_64.c   |    2 +-
 arch/x86/kernel/cpu/mcheck/mce_intel_64.c |    2 +-
 arch/x86/kernel/time_32.c                 |    2 +-
 arch/x86/kernel/time_64.c                 |    2 +-
 arch/x86/kernel/tlb_32.c                  |    2 +-
 arch/x86/kernel/tlb_64.c                  |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

applied to tip/x86/irq, thanks!

Ingo