diff options
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 74d40c6855b8..4c5891de162e 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) | |||
114 | static inline notrace int decrementer_check_overflow(void) | 114 | static inline notrace int decrementer_check_overflow(void) |
115 | { | 115 | { |
116 | u64 now = get_tb_or_rtc(); | 116 | u64 now = get_tb_or_rtc(); |
117 | u64 *next_tb = this_cpu_ptr(&decrementers_next_tb); | 117 | u64 *next_tb = &__get_cpu_var(decrementers_next_tb); |
118 | 118 | ||
119 | return now >= *next_tb; | 119 | return now >= *next_tb; |
120 | } | 120 | } |
@@ -499,7 +499,7 @@ void __do_irq(struct pt_regs *regs) | |||
499 | 499 | ||
500 | /* And finally process it */ | 500 | /* And finally process it */ |
501 | if (unlikely(irq == NO_IRQ)) | 501 | if (unlikely(irq == NO_IRQ)) |
502 | __this_cpu_inc(irq_stat.spurious_irqs); | 502 | __get_cpu_var(irq_stat).spurious_irqs++; |
503 | else | 503 | else |
504 | generic_handle_irq(irq); | 504 | generic_handle_irq(irq); |
505 | 505 | ||