upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / asm-ia64 / tlb.h

diff --git a/include/asm-ia64/tlb.h b/include/asm-ia64/tlb.h
index 54d3355..11614b1 100644 (file)
--- a/include/asm-ia64/tlb.h
+++ b/include/asm-ia64/tlb.h
@@ -162,12 +162,11 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
 {
        unsigned long freed = tlb->freed;
        struct mm_struct *mm = tlb->mm;
-       unsigned long rss = mm->rss;
+       unsigned long rss = get_mm_counter(mm, rss);
 
        if (rss < freed)
                freed = rss;
-       // mm->rss = rss - freed;
-       vx_rsspages_sub(mm, freed);
+       add_mm_counter(mm, rss, -freed);
        /*
         * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
         * tlb->end_addr.
@@ -238,4 +237,10 @@ do {                                                       \
        __pmd_free_tlb(tlb, ptep);                      \
 } while (0)
 
+#define pud_free_tlb(tlb, pudp)                                \
+do {                                                   \
+       tlb->need_flush = 1;                            \
+       __pud_free_tlb(tlb, pudp);                      \
+} while (0)
+
 #endif /* _ASM_IA64_TLB_H */