From 7c88fc4650e0a0c5f263fb0878cc9e8d49709fbd Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 15 Nov 2010 14:15:03 +0000 Subject: [PATCH] --- yaml --- r: 225871 b: refs/heads/master c: 46c48f222f568decb881a552caa1c8f9c96c521e h: refs/heads/master i: 225869: 9c916fd7104d0b692d3c72855d352eced3628587 225867: f37eb42386a0320da2809baa2f724bc418aa7d5e 225863: 26ddb2fb111a86097014a19af4a276cf6132298b 225855: 79e4c244f086136fe3dd2bd21975206ce502c679 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/hardirq.h | 3 +++ trunk/arch/arm/kernel/smp.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d257bdccc4ff..f98c247dfb26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec405ea9fe5fdeb40824edba7082803b3e98f176 +refs/heads/master: 46c48f222f568decb881a552caa1c8f9c96c521e diff --git a/trunk/arch/arm/include/asm/hardirq.h b/trunk/arch/arm/include/asm/hardirq.h index 522fb23241ac..923eaa1ba83b 100644 --- a/trunk/arch/arm/include/asm/hardirq.h +++ b/trunk/arch/arm/include/asm/hardirq.h @@ -14,6 +14,9 @@ typedef struct { #include /* Standard mappings for irq_cpustat_t above */ +#define __inc_irq_stat(cpu, member) __IRQ_STAT(cpu, member)++ +#define __get_irq_stat(cpu, member) __IRQ_STAT(cpu, member) + #if NR_IRQS > 512 #define HARDIRQ_BITS 10 #elif NR_IRQS > 256 diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 36d4b9140dcf..24131264ec2c 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -423,7 +423,7 @@ asmlinkage void __exception do_local_timer(struct pt_regs *regs) int cpu = smp_processor_id(); if (local_timer_ack()) { - irq_stat[cpu].local_timer_irqs++; + __inc_irq_stat(cpu, local_timer_irqs); ipi_timer(); } @@ -437,7 +437,7 @@ void show_local_irqs(struct seq_file *p) seq_printf(p, "LOC: "); for_each_present_cpu(cpu) - seq_printf(p, "%10u ", irq_stat[cpu].local_timer_irqs); + seq_printf(p, "%10u ", __get_irq_stat(cpu, local_timer_irqs)); seq_putc(p, '\n'); }