diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:15:32 +1100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:15:32 +1100 |
commit | fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3 (patch) | |
tree | 050a81468f8644cfb0f3c07a140456c136301a30 /arch/x86/mm/pgtable_32.c | |
parent | e95035c61a4c3dae1aa543a5bf5b39846daca061 (diff) | |
parent | 62152d0ea7012382cd814c7b361b4ef2029f26e6 (diff) | |
download | kernel-crypto-fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3.tar.gz kernel-crypto-fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3.tar.xz kernel-crypto-fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
asm-generic/tlb.h: build fix
x86: uninline __pte_free_tlb() and __pmd_free_tlb()
x86: fix small sparse warning
x86: fix sparse warning in kernel/scx200_32.c
x86: early_ioremap_reset fix 2
x86: c_p_a clflush_cache_range fix
x86: change_page_attr_clear fix
x86: fix sparse warnings in intel_cacheinfo.c
Diffstat (limited to 'arch/x86/mm/pgtable_32.c')
-rw-r--r-- | arch/x86/mm/pgtable_32.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 2ae5999a795..cb3aa470249 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -376,3 +376,26 @@ void check_pgt_cache(void) { quicklist_trim(0, pgd_dtor, 25, 16); } + +void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) +{ + paravirt_release_pt(page_to_pfn(pte)); + tlb_remove_page(tlb, pte); +} + +#ifdef CONFIG_X86_PAE + +void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) +{ + /* This is called just after the pmd has been detached from + the pgd, which requires a full tlb flush to be recognized + by the CPU. Rather than incurring multiple tlb flushes + while the address space is being pulled down, make the tlb + gathering machinery do a full flush when we're done. */ + tlb->fullmm = 1; + + paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT); + tlb_remove_page(tlb, virt_to_page(pmd)); +} + +#endif |