Revert "powerpc: Replace __get_cpu_var uses"

This reverts commit 5828f666c069af74e00db21559f1535103c9f79a due to
build failure after merging with pending powerpc changes.

Link: http://lkml.kernel.org/g/20140827142243.6277eaff@canb.auug.org.au

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 7 insertions, 9 deletions

diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/hardirq.h
index 8d907ba4fd05..1bbb3013d6aa 100644
--- a/arch/powerpc/include/asm/hardirq.h
+++ b/arch/powerpc/include/asm/hardirq.h
@@ -21,9 +21,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
 
 #define __ARCH_IRQ_STAT
 
-#define local_softirq_pending() __this_cpu_read(irq_stat.__softirq_pending)
-#define set_softirq_pending(x) __this_cpu_write(irq_stat._softirq_pending, (x))
-#define or_softirq_pending(x) __this_cpu_or(irq_stat._softirq_pending, (x))
+#define local_softirq_pending() __get_cpu_var(irq_stat).__softirq_pending
 
 static inline void ack_bad_irq(unsigned int irq)
 {
diff --git a/arch/powerpc/include/asm/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h
index cd7c2719d3ef..2def01ed0cb2 100644
--- a/arch/powerpc/include/asm/tlbflush.h
+++ b/arch/powerpc/include/asm/tlbflush.h
@@ -107,14 +107,14 @@ extern void __flush_tlb_pending(struct ppc64_tlb_batch *batch);
 
 static inline void arch_enter_lazy_mmu_mode(void)
 {
-        struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
+        struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
 
         batch->active = 1;
 }
 
 static inline void arch_leave_lazy_mmu_mode(void)
 {
-        struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
+        struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
 
         if (batch->index)
                 __flush_tlb_pending(batch);
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
index 5007ad0448ce..282d43a0c855 100644
--- a/arch/powerpc/include/asm/xics.h
+++ b/arch/powerpc/include/asm/xics.h
@@ -97,7 +97,7 @@ DECLARE_PER_CPU(struct xics_cppr, xics_cppr);
 
 static inline void xics_push_cppr(unsigned int vec)
 {
-        struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
 
         if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
                 return;
@@ -110,7 +110,7 @@ static inline void xics_push_cppr(unsigned int vec)
 
 static inline unsigned char xics_pop_cppr(void)
 {
-        struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
 
         if (WARN_ON(os_cppr->index < 1))
                 return LOWEST_PRIORITY;
@@ -120,7 +120,7 @@ static inline unsigned char xics_pop_cppr(void)
 
 static inline void xics_set_base_cppr(unsigned char cppr)
 {
-        struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
 
         /* we only really want to set the priority when there's
          * just one cppr value on the stack
@@ -132,7 +132,7 @@ static inline void xics_set_base_cppr(unsigned char cppr)
 
 static inline unsigned char xics_cppr_top(void)
 {
-        struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr);
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
         
         return os_cppr->stack[os_cppr->index];
 }