diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/m68k/include/asm/motorola_pgalloc.h | |
| parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'arch/m68k/include/asm/motorola_pgalloc.h')
| -rw-r--r-- | arch/m68k/include/asm/motorola_pgalloc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h index d08bf6261df8..2f02f264e694 100644 --- a/arch/m68k/include/asm/motorola_pgalloc.h +++ b/arch/m68k/include/asm/motorola_pgalloc.h | |||
| @@ -36,12 +36,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres | |||
| 36 | return NULL; | 36 | return NULL; |
| 37 | 37 | ||
| 38 | pte = kmap(page); | 38 | pte = kmap(page); |
| 39 | if (pte) { | 39 | __flush_page_to_ram(pte); |
| 40 | __flush_page_to_ram(pte); | 40 | flush_tlb_kernel_page(pte); |
| 41 | flush_tlb_kernel_page(pte); | 41 | nocache_page(pte); |
| 42 | nocache_page(pte); | 42 | kunmap(page); |
| 43 | } | ||
| 44 | kunmap(pte); | ||
| 45 | pgtable_page_ctor(page); | 43 | pgtable_page_ctor(page); |
| 46 | return page; | 44 | return page; |
| 47 | } | 45 | } |
| @@ -54,7 +52,8 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t page) | |||
| 54 | __free_page(page); | 52 | __free_page(page); |
| 55 | } | 53 | } |
| 56 | 54 | ||
| 57 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page) | 55 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page, |
| 56 | unsigned long address) | ||
| 58 | { | 57 | { |
| 59 | pgtable_page_dtor(page); | 58 | pgtable_page_dtor(page); |
| 60 | cache_page(kmap(page)); | 59 | cache_page(kmap(page)); |
| @@ -73,7 +72,8 @@ static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
| 73 | return free_pointer_table(pmd); | 72 | return free_pointer_table(pmd); |
| 74 | } | 73 | } |
| 75 | 74 | ||
| 76 | static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | 75 | static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, |
| 76 | unsigned long address) | ||
| 77 | { | 77 | { |
| 78 | return free_pointer_table(pmd); | 78 | return free_pointer_table(pmd); |
| 79 | } | 79 | } |