diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-08 19:33:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:22:53 -0400 |
commit | eab1eef9911c36966b5d5934e6970581b3316013 (patch) | |
tree | 3d47f3c5b9f92b2d4e626fb8fdc0c18cfedc5ffb /mm | |
parent | 2d28a2275c21d04290cfba1555c89a806d2b7706 (diff) |
mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
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 <catalin.marinas@arm.com>
Signed-off-by: Steve Capper <steve.capper@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | 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 7153e0d18670..0e7740923fb9 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c | |||
@@ -889,7 +889,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
889 | entry = pmd_mkyoung(orig_pmd); | 889 | entry = pmd_mkyoung(orig_pmd); |
890 | entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); | 890 | entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); |
891 | if (pmdp_set_access_flags(vma, haddr, pmd, entry, 1)) | 891 | if (pmdp_set_access_flags(vma, haddr, pmd, entry, 1)) |
892 | update_mmu_cache(vma, address, entry); | 892 | update_mmu_cache(vma, address, pmd); |
893 | ret |= VM_FAULT_WRITE; | 893 | ret |= VM_FAULT_WRITE; |
894 | goto out_unlock; | 894 | goto out_unlock; |
895 | } | 895 | } |
@@ -941,7 +941,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
941 | pmdp_clear_flush_notify(vma, haddr, pmd); | 941 | pmdp_clear_flush_notify(vma, haddr, pmd); |
942 | page_add_new_anon_rmap(new_page, vma, haddr); | 942 | page_add_new_anon_rmap(new_page, vma, haddr); |
943 | set_pmd_at(mm, haddr, pmd, entry); | 943 | set_pmd_at(mm, haddr, pmd, entry); |
944 | update_mmu_cache(vma, address, entry); | 944 | update_mmu_cache(vma, address, pmd); |
945 | page_remove_rmap(page); | 945 | page_remove_rmap(page); |
946 | put_page(page); | 946 | put_page(page); |
947 | ret |= VM_FAULT_WRITE; | 947 | ret |= VM_FAULT_WRITE; |
@@ -2002,7 +2002,7 @@ static void collapse_huge_page(struct mm_struct *mm, | |||
2002 | BUG_ON(!pmd_none(*pmd)); | 2002 | BUG_ON(!pmd_none(*pmd)); |
2003 | page_add_new_anon_rmap(new_page, vma, address); | 2003 | page_add_new_anon_rmap(new_page, vma, address); |
2004 | set_pmd_at(mm, address, pmd, _pmd); | 2004 | set_pmd_at(mm, address, pmd, _pmd); |
2005 | update_mmu_cache(vma, address, _pmd); | 2005 | update_mmu_cache(vma, address, pmd); |
2006 | pgtable_trans_huge_deposit(mm, pgtable); | 2006 | pgtable_trans_huge_deposit(mm, pgtable); |
2007 | spin_unlock(&mm->page_table_lock); | 2007 | spin_unlock(&mm->page_table_lock); |
2008 | 2008 | ||