diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
commit | ff71abad53cdd1856e6a77ef71a09f1df46c9b87 (patch) | |
tree | 82f61a0765f7ea45fb6bd87a537bb656eb181601 /include/linux/kernel_stat.h | |
parent | aaca8c6eac21c9a662d87ff0e83eb176af970213 (diff) | |
parent | b924047fe07689ed9b7f0a8e14826534caaff8fc (diff) |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'include/linux/kernel_stat.h')
-rw-r--r-- | include/linux/kernel_stat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index ad54c846911b..44e83ba12b5b 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -47,7 +47,7 @@ extern unsigned long long nr_context_switches(void); #ifndef CONFIG_GENERIC_HARDIRQS #define kstat_irqs_this_cpu(irq) \ - (kstat_this_cpu.irqs[irq]) + (this_cpu_read(kstat.irqs[irq]) struct irq_desc; |