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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-generic
/
tlb.h
diff --git
a/include/asm-generic/tlb.h
b/include/asm-generic/tlb.h
index
1358c51
..
7e810dc
100644
(file)
--- a/
include/asm-generic/tlb.h
+++ b/
include/asm-generic/tlb.h
@@
-1,4
+1,4
@@
-/* asm-generic/tlb.h
+/*
include/
asm-generic/tlb.h
*
* Generic TLB shootdown code
*
*
* Generic TLB shootdown code
*
@@
-13,8
+13,9
@@
#ifndef _ASM_GENERIC__TLB_H
#define _ASM_GENERIC__TLB_H
#ifndef _ASM_GENERIC__TLB_H
#define _ASM_GENERIC__TLB_H
-#include <linux/config.h>
#include <linux/swap.h>
#include <linux/swap.h>
+#include <linux/vs_memory.h>
+#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
/*
#include <asm/tlbflush.h>
/*
@@
-22,7
+23,11
@@
* and page free order so much..
*/
#ifdef CONFIG_SMP
* and page free order so much..
*/
#ifdef CONFIG_SMP
- #define FREE_PTE_NR 506
+ #ifdef ARCH_FREE_PTR_NR
+ #define FREE_PTR_NR ARCH_FREE_PTR_NR
+ #else
+ #define FREE_PTE_NR 506
+ #endif
#define tlb_fast_mode(tlb) ((tlb)->nr == ~0U)
#else
#define FREE_PTE_NR 1
#define tlb_fast_mode(tlb) ((tlb)->nr == ~0U)
#else
#define FREE_PTE_NR 1
@@
-30,16
+35,13
@@
#endif
/* struct mmu_gather is an opaque type used by the mm code for passing around
#endif
/* struct mmu_gather is an opaque type used by the mm code for passing around
- * any data needed by arch specific code for tlb_remove_page. This structure
- * can be per-CPU or per-MM as the page table lock is held for the duration of
- * TLB shootdown.
+ * any data needed by arch specific code for tlb_remove_page.
*/
struct mmu_gather {
struct mm_struct *mm;
unsigned int nr; /* set to ~0U means fast mode */
unsigned int need_flush;/* Really unmapped some ptes? */
unsigned int fullmm; /* non-zero means full mm flush */
*/
struct mmu_gather {
struct mm_struct *mm;
unsigned int nr; /* set to ~0U means fast mode */
unsigned int need_flush;/* Really unmapped some ptes? */
unsigned int fullmm; /* non-zero means full mm flush */
- unsigned long freed;
struct page * pages[FREE_PTE_NR];
};
struct page * pages[FREE_PTE_NR];
};
@@
-52,7
+54,7
@@
DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
static inline struct mmu_gather *
tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
{
static inline struct mmu_gather *
tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
{
- struct mmu_gather *tlb = &
per_cpu(mmu_gathers, smp_processor_id()
);
+ struct mmu_gather *tlb = &
get_cpu_var(mmu_gathers
);
tlb->mm = mm;
tlb->mm = mm;
@@
-60,7
+62,6
@@
tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
tlb->nr = num_online_cpus() > 1 ? 0U : ~0U;
tlb->fullmm = full_mm_flush;
tlb->nr = num_online_cpus() > 1 ? 0U : ~0U;
tlb->fullmm = full_mm_flush;
- tlb->freed = 0;
return tlb;
}
return tlb;
}
@@
-80,28
+81,17
@@
tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
/* tlb_finish_mmu
* Called at the end of the shootdown operation to free up any resources
/* tlb_finish_mmu
* Called at the end of the shootdown operation to free up any resources
- * that were required.
The page table lock is still held at this point.
+ * that were required.
*/
static inline void
tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
*/
static inline void
tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
{
- int freed = tlb->freed;
- struct mm_struct *mm = tlb->mm;
- int rss = mm->rss;
-
- if (rss < freed)
- freed = rss;
- mm->rss = rss - freed;
tlb_flush_mmu(tlb, start, end);
/* keep the page table cache within bounds */
check_pgt_cache();
tlb_flush_mmu(tlb, start, end);
/* keep the page table cache within bounds */
check_pgt_cache();
-}
-static inline unsigned int
-tlb_is_full_mm(struct mmu_gather *tlb)
-{
- return tlb->fullmm;
+ put_cpu_var(mmu_gathers);
}
/* tlb_remove_page
}
/* tlb_remove_page
@@
-140,10
+130,20
@@
static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
__pte_free_tlb(tlb, ptep); \
} while (0)
__pte_free_tlb(tlb, ptep); \
} while (0)
+#ifndef __ARCH_HAS_4LEVEL_HACK
+#define pud_free_tlb(tlb, pudp) \
+ do { \
+ tlb->need_flush = 1; \
+ __pud_free_tlb(tlb, pudp); \
+ } while (0)
+#endif
+
#define pmd_free_tlb(tlb, pmdp) \
do { \
tlb->need_flush = 1; \
__pmd_free_tlb(tlb, pmdp); \
} while (0)
#define pmd_free_tlb(tlb, pmdp) \
do { \
tlb->need_flush = 1; \
__pmd_free_tlb(tlb, pmdp); \
} while (0)
+#define tlb_migrate_finish(mm) do {} while (0)
+
#endif /* _ASM_GENERIC__TLB_H */
#endif /* _ASM_GENERIC__TLB_H */