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 /include | |
| parent | e95035c61a4c3dae1aa543a5bf5b39846daca061 (diff) | |
| parent | 62152d0ea7012382cd814c7b361b4ef2029f26e6 (diff) | |
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 'include')
| -rw-r--r-- | include/asm-generic/tlb.h | 1 | ||||
| -rw-r--r-- | include/asm-x86/pgalloc_32.h | 20 | ||||
| -rw-r--r-- | include/linux/swap.h | 1 |
3 files changed, 4 insertions, 18 deletions
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 6ce9f3ab928..75f2bfab614 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -15,6 +15,7 @@ #include <linux/swap.h> #include <linux/quicklist.h> +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /* diff --git a/include/asm-x86/pgalloc_32.h b/include/asm-x86/pgalloc_32.h index 10c2b452e64..7641e7b5d93 100644 --- a/include/asm-x86/pgalloc_32.h +++ b/include/asm-x86/pgalloc_32.h @@ -3,6 +3,7 @@ #include <linux/threads.h> #include <linux/mm.h> /* for struct page */ +#include <linux/pagemap.h> #include <asm/tlb.h> #include <asm-generic/tlb.h> @@ -51,11 +52,7 @@ static inline void pte_free(struct page *pte) } -static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) -{ - paravirt_release_pt(page_to_pfn(pte)); - tlb_remove_page(tlb, pte); -} +extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte); #ifdef CONFIG_X86_PAE /* @@ -72,18 +69,7 @@ static inline void pmd_free(pmd_t *pmd) free_page((unsigned long)pmd); } -static inline 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)); -} +extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd); static inline void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) { diff --git a/include/linux/swap.h b/include/linux/swap.h index 2c3ce4c69b2..4f3838adbb3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -6,7 +6,6 @@ #include <linux/mmzone.h> #include <linux/list.h> #include <linux/sched.h> -#include <linux/pagemap.h> #include <asm/atomic.h> #include <asm/page.h> |