summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/pgalloc.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
commite8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch)
tree31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/sh/include/asm/pgalloc.h
parentx86: properly annotate alternatives.c (diff)
parentx86: Fix build with older binutils and consolidate linker script (diff)
downloadlinux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.tar.xz
linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.zip
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/sh/include/asm/pgalloc.h')
-rw-r--r--arch/sh/include/asm/pgalloc.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index 84dd2db7104c..63ca37bd9a95 100644
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -73,20 +73,12 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
quicklist_free_page(QUICK_PT, NULL, pte);
}
-#define __pte_free_tlb(tlb,pte) \
+#define __pte_free_tlb(tlb,pte,addr) \
do { \
pgtable_page_dtor(pte); \
tlb_remove_page((tlb), (pte)); \
} while (0)
-/*
- * allocating and freeing a pmd is trivial: the 1-entry pmd is
- * inside the pgd, so has no extra memory associated with it.
- */
-
-#define pmd_free(mm, x) do { } while (0)
-#define __pmd_free_tlb(tlb,x) do { } while (0)
-
static inline void check_pgt_cache(void)
{
quicklist_trim(QUICK_PGD, NULL, 25, 16);