powerpc: merge uaccess.h

[linux-2.6-omap-h63xx.git] / include / asm-ppc64 / tlbflush.h

diff --git a/include/asm-ppc64/tlbflush.h b/include/asm-ppc64/tlbflush.h
index 45411a67e0825f3e4685bfeebd5d6724a0ab6ab3..626f505c6ee3f46dc82190bdb5e82cdc886e3272 100644 (file)
--- a/include/asm-ppc64/tlbflush.h
+++ b/include/asm-ppc64/tlbflush.h
@@ -20,11 +20,10 @@
 struct mm_struct;
 struct ppc64_tlb_batch {
        unsigned long index;
-       unsigned long context;
        struct mm_struct *mm;
        pte_t pte[PPC64_TLB_BATCH_NR];
-       unsigned long addr[PPC64_TLB_BATCH_NR];
        unsigned long vaddr[PPC64_TLB_BATCH_NR];
+       unsigned int large;
 };
 DECLARE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
 
@@ -47,8 +46,7 @@ static inline void flush_tlb_pending(void)
 #define flush_tlb_kernel_range(start, end)     flush_tlb_pending()
 #define flush_tlb_pgtables(mm, start, end)     do { } while (0)
 
-extern void flush_hash_page(unsigned long context, unsigned long ea, pte_t pte,
-                           int local);
-void flush_hash_range(unsigned long context, unsigned long number, int local);
+extern void flush_hash_page(unsigned long va, pte_t pte, int local);
+void flush_hash_range(unsigned long number, int local);
 
 #endif /* _PPC64_TLBFLUSH_H */