git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
pgalloc.h
diff --git
a/arch/ia64/include/asm/pgalloc.h
b/arch/ia64/include/asm/pgalloc.h
index
b9ac1a6
..
96a8d92
100644
(file)
--- a/
arch/ia64/include/asm/pgalloc.h
+++ b/
arch/ia64/include/asm/pgalloc.h
@@
-48,7
+48,7
@@
static inline void pud_free(struct mm_struct *mm, pud_t *pud)
{
quicklist_free(0, NULL, pud);
}
{
quicklist_free(0, NULL, pud);
}
-#define __pud_free_tlb(tlb, pud
)
pud_free((tlb)->mm, pud)
+#define __pud_free_tlb(tlb, pud
, address)
pud_free((tlb)->mm, pud)
#endif /* CONFIG_PGTABLE_4 */
static inline void
#endif /* CONFIG_PGTABLE_4 */
static inline void
@@
-67,7
+67,7
@@
static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
quicklist_free(0, NULL, pmd);
}
quicklist_free(0, NULL, pmd);
}
-#define __pmd_free_tlb(tlb, pmd
)
pmd_free((tlb)->mm, pmd)
+#define __pmd_free_tlb(tlb, pmd
, address)
pmd_free((tlb)->mm, pmd)
static inline void
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, pgtable_t pte)
static inline void
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, pgtable_t pte)
@@
-117,6
+117,6
@@
static inline void check_pgt_cache(void)
quicklist_trim(0, NULL, 25, 16);
}
quicklist_trim(0, NULL, 25, 16);
}
-#define __pte_free_tlb(tlb, pte
)
pte_free((tlb)->mm, pte)
+#define __pte_free_tlb(tlb, pte
, address)
pte_free((tlb)->mm, pte)
#endif /* _ASM_IA64_PGALLOC_H */
#endif /* _ASM_IA64_PGALLOC_H */