Merge git://git.kvack.org/~bcrl/aio-next

[cascardo/linux.git] / arch / powerpc / platforms / pseries / lpar.c

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index f6880d2..469751d 100644 (file)
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -284,7 +284,7 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,
                                       unsigned long newpp,
                                       unsigned long vpn,
                                       int psize, int apsize,
-                                      int ssize, int local)
+                                      int ssize, unsigned long inv_flags)
 {
        unsigned long lpar_rc;
        unsigned long flags = (newpp & 7) | H_AVPN;
@@ -442,7 +442,7 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot,
 static void pSeries_lpar_hugepage_invalidate(unsigned long vsid,
                                             unsigned long addr,
                                             unsigned char *hpte_slot_array,
-                                            int psize, int ssize)
+                                            int psize, int ssize, int local)
 {
        int i, index = 0;
        unsigned long s_addr = addr;
@@ -515,7 +515,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;
@@ -705,7 +705,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;
@@ -730,7 +730,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;