diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-29 19:03:16 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-07-29 19:03:16 +0200 |
| commit | 54181c4666e2b0782ecc41c99442dde39e38a016 (patch) | |
| tree | 296eff483991c5cf579a83bdc7662e6dcdf4363c /arch/cris | |
| parent | 1326092fd29c62afad877c0b640ce415863e424d (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
| download | lwn-54181c4666e2b0782ecc41c99442dde39e38a016.tar.gz lwn-54181c4666e2b0782ecc41c99442dde39e38a016.zip | |
Merge branch 'linus' into rt/base
Diffstat (limited to 'arch/cris')
| -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); \ |