powerpc: Replace __get_cpu_var uses

[pandora-kernel.git] / arch / powerpc / platforms / pseries / lpar.c

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 34e6423..56df72d 100644 (file)
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -507,7 +507,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
        unsigned long vpn;
        unsigned long i, pix, rc;
        unsigned long flags = 0;
-       struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
+       struct ppc64_tlb_batch *batch = this_cpu_ptr(&ppc64_tlb_batch);
        int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
        unsigned long param[9];
        unsigned long hash, index, shift, hidx, slot;
@@ -697,7 +697,7 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
 
        local_irq_save(flags);
 
-       depth = &__get_cpu_var(hcall_trace_depth);
+       depth = this_cpu_ptr(&hcall_trace_depth);
 
        if (*depth)
                goto out;
@@ -722,7 +722,7 @@ void __trace_hcall_exit(long opcode, unsigned long retval,
 
        local_irq_save(flags);
 
-       depth = &__get_cpu_var(hcall_trace_depth);
+       depth = this_cpu_ptr(&hcall_trace_depth);
 
        if (*depth)
                goto out;