diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 00:40:29 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 00:40:29 +0200 |
| commit | e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch) | |
| tree | 31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/cris/include/asm/pgalloc.h | |
| parent | x86: properly annotate alternatives.c (diff) | |
| parent | x86: Fix build with older binutils and consolidate linker script (diff) | |
| download | linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.tar.xz linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.zip | |
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/cris/include/asm/pgalloc.h')
| -rw-r--r-- | arch/cris/include/asm/pgalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h index a1ba761d0573..6da975db112f 100644 --- a/arch/cris/include/asm/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h @@ -47,7 +47,7 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte) __free_page(pte); } -#define __pte_free_tlb(tlb,pte) \ +#define __pte_free_tlb(tlb,pte,address) \ do { \ pgtable_page_dtor(pte); \ tlb_remove_page((tlb), pte); \ |