git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-ia64
/
tlb.h
diff --git
a/include/asm-ia64/tlb.h
b/include/asm-ia64/tlb.h
index
5d714b2
..
beaca6d
100644
(file)
--- a/
include/asm-ia64/tlb.h
+++ b/
include/asm-ia64/tlb.h
@@
-39,11
+39,14
@@
*/
#include <linux/config.h>
#include <linux/mm.h>
*/
#include <linux/config.h>
#include <linux/mm.h>
+#include <linux/pagemap.h>
#include <linux/swap.h>
#include <linux/swap.h>
+#include <linux/vs_memory.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
#include <asm/tlbflush.h>
+#include <asm/machvec.h>
#ifdef CONFIG_SMP
# define FREE_PTE_NR 2048
#ifdef CONFIG_SMP
# define FREE_PTE_NR 2048
@@
-163,7
+166,8
@@
tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
if (rss < freed)
freed = rss;
if (rss < freed)
freed = rss;
- mm->rss = rss - freed;
+ // mm->rss = rss - freed;
+ vx_rsspages_sub(mm, freed);
/*
* Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
* tlb->end_addr.
/*
* Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
* tlb->end_addr.
@@
-211,6
+215,8
@@
__tlb_remove_tlb_entry (struct mmu_gather *tlb, pte_t *ptep, unsigned long addre
tlb->end_addr = address + PAGE_SIZE;
}
tlb->end_addr = address + PAGE_SIZE;
}
+#define tlb_migrate_finish(mm) platform_tlb_migrate_finish(mm)
+
#define tlb_start_vma(tlb, vma) do { } while (0)
#define tlb_end_vma(tlb, vma) do { } while (0)
#define tlb_start_vma(tlb, vma) do { } while (0)
#define tlb_end_vma(tlb, vma) do { } while (0)
@@
-232,4
+238,10
@@
do { \
__pmd_free_tlb(tlb, ptep); \
} while (0)
__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 */
#endif /* _ASM_IA64_TLB_H */