summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/pgalloc.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-15 05:58:45 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-15 05:58:45 +0900
commitd2dcd9101b1a940ce8496601ba871e47f84881ec (patch)
tree3de9cb11379d51eb01b568a20c8d7c585c89d10e /arch/microblaze/include/asm/pgalloc.h
parent8010fbe7a67c2f993cbb11b9d8b7e98528256dd1 (diff)
parent606b4c992f3b28f906100f1b6eb49059909d8da7 (diff)
Merge branch 'master' into sh/cachetlb
Diffstat (limited to 'arch/microblaze/include/asm/pgalloc.h')
-rw-r--r--arch/microblaze/include/asm/pgalloc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pgalloc.h b/arch/microblaze/include/asm/pgalloc.h
index 59a757e46ba5..b0131da1387b 100644
--- a/arch/microblaze/include/asm/pgalloc.h
+++ b/arch/microblaze/include/asm/pgalloc.h
@@ -180,7 +180,7 @@ extern inline void pte_free(struct mm_struct *mm, struct page *ptepage)
__free_page(ptepage);
}
-#define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte))
+#define __pte_free_tlb(tlb, pte, addr) pte_free((tlb)->mm, (pte))
#define pmd_populate(mm, pmd, pte) (pmd_val(*(pmd)) = page_address(pte))
@@ -193,7 +193,7 @@ extern inline void pte_free(struct mm_struct *mm, struct page *ptepage)
*/
#define pmd_alloc_one(mm, address) ({ BUG(); ((pmd_t *)2); })
/*#define pmd_free(mm, x) do { } while (0)*/
-#define __pmd_free_tlb(tlb, x) do { } while (0)
+#define __pmd_free_tlb(tlb, x, addr) do { } while (0)
#define pgd_populate(mm, pmd, pte) BUG()
extern int do_check_pgt_cache(int, int);