On Tue, Sep 11, 2012 at 05:47:15PM +0100, Will Deacon wrote: > From: Catalin Marinas <[email protected]> > > The update_mmu_cache() takes a pointer (to pte_t by default) as the last > argument but the huge_memory.c passes a pmd_t value. The patch changes > the argument to the pmd_t * pointer. > > Signed-off-by: Catalin Marinas <[email protected]> > Signed-off-by: Steve Capper <[email protected]> > Signed-off-by: Will Deacon <[email protected]>
Reviewed-by: Kirill A. Shutemov <[email protected]> > --- > mm/huge_memory.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 57c4b93..4aa6d02 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -934,7 +934,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct > vm_area_struct *vma, > entry = pmd_mkyoung(orig_pmd); > entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); > if (pmdp_set_access_flags(vma, haddr, pmd, entry, 1)) > - update_mmu_cache(vma, address, entry); > + update_mmu_cache(vma, address, pmd); > ret |= VM_FAULT_WRITE; > goto out_unlock; > } > @@ -986,7 +986,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct > vm_area_struct *vma, > pmdp_clear_flush_notify(vma, haddr, pmd); > page_add_new_anon_rmap(new_page, vma, haddr); > set_pmd_at(mm, haddr, pmd, entry); > - update_mmu_cache(vma, address, entry); > + update_mmu_cache(vma, address, pmd); > page_remove_rmap(page); > put_page(page); > ret |= VM_FAULT_WRITE; > @@ -1989,7 +1989,7 @@ static void collapse_huge_page(struct mm_struct *mm, > BUG_ON(!pmd_none(*pmd)); > page_add_new_anon_rmap(new_page, vma, address); > set_pmd_at(mm, address, pmd, _pmd); > - update_mmu_cache(vma, address, _pmd); > + update_mmu_cache(vma, address, pmd); > prepare_pmd_huge_pte(pgtable, mm); > spin_unlock(&mm->page_table_lock); > > -- > 1.7.4.1 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to [email protected]. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"[email protected]";> [email protected] </a> -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
