diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /include/asm-arm/tlb.h | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/tlb.h')
| -rw-r--r-- | include/asm-arm/tlb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/tlb.h b/include/asm-arm/tlb.h index cb740025d413..36bd402a21cb 100644 --- a/include/asm-arm/tlb.h +++ b/include/asm-arm/tlb.h | |||
| @@ -85,8 +85,8 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) | |||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) | 87 | #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) |
| 88 | #define pte_free_tlb(tlb,ptep) pte_free(ptep) | 88 | #define pte_free_tlb(tlb, ptep) pte_free((tlb)->mm, ptep) |
| 89 | #define pmd_free_tlb(tlb,pmdp) pmd_free(pmdp) | 89 | #define pmd_free_tlb(tlb, pmdp) pmd_free((tlb)->mm, pmdp) |
| 90 | 90 | ||
| 91 | #define tlb_migrate_finish(mm) do { } while (0) | 91 | #define tlb_migrate_finish(mm) do { } while (0) |
| 92 | 92 | ||