diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 10:00:31 (GMT) |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 10:00:31 (GMT) |
commit | dd521d1eb4bc7f12a0d440134cb3a72852b6da9c (patch) | |
tree | f573c86df9bd60626ad9a8746b82e254b7cac977 /arch/powerpc/kernel/irq.c | |
parent | 8418804ef27e5f7988480d86ecf9dfd56cebc53b (diff) | |
parent | 69111bac42f5ceacdd22e30947837ceb2c4493ed (diff) | |
download | linux-dd521d1eb4bc7f12a0d440134cb3a72852b6da9c.tar.xz |
Merge branch 'topic/get-cpu-var' into next
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index c143835..8d87bb1 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -114,7 +114,7 @@ static inline notrace void set_soft_enabled(unsigned long enable) static inline notrace int decrementer_check_overflow(void) { u64 now = get_tb_or_rtc(); - u64 *next_tb = &__get_cpu_var(decrementers_next_tb); + u64 *next_tb = this_cpu_ptr(&decrementers_next_tb); return now >= *next_tb; } @@ -499,7 +499,7 @@ void __do_irq(struct pt_regs *regs) /* And finally process it */ if (unlikely(irq == NO_IRQ)) - __get_cpu_var(irq_stat).spurious_irqs++; + __this_cpu_inc(irq_stat.spurious_irqs); else generic_handle_irq(irq); |