From: Will Deacon <will.deacon@arm.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
akpm@linux-foundation.org, mhocko@suse.cz,
Catalin Marinas <catalin.marinas@arm.com>,
Steve Capper <steve.capper@arm.com>,
Will Deacon <will.deacon@arm.com>
Subject: [PATCH 2/3] mm: thp: Fix the update_mmu_cache() last argument passing in mm/huge_memory.c
Date: Tue, 11 Sep 2012 17:47:15 +0100 [thread overview]
Message-ID: <1347382036-18455-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1347382036-18455-1-git-send-email-will.deacon@arm.com>
From: Catalin Marinas <catalin.marinas@arm.com>
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>
---
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
next prev parent reply other threads:[~2012-09-11 16:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 16:47 [PATCH 0/3] Minor changes to common hugetlb code for ARM Will Deacon
2012-09-11 16:47 ` Will Deacon
2012-09-11 16:47 ` [PATCH 1/3] mm: thp: Fix the pmd_clear() arguments in pmdp_get_and_clear() Will Deacon
2012-09-11 16:47 ` Will Deacon
2012-09-11 17:12 ` Kirill A. Shutemov
2012-09-11 17:12 ` Kirill A. Shutemov
2012-09-12 15:30 ` Michal Hocko
2012-09-12 15:30 ` Michal Hocko
2012-09-11 16:47 ` Will Deacon [this message]
2012-09-11 17:38 ` [PATCH 2/3] mm: thp: Fix the update_mmu_cache() last argument passing in mm/huge_memory.c Kirill A. Shutemov
2012-09-11 17:38 ` Kirill A. Shutemov
2012-09-12 15:40 ` Michal Hocko
2012-09-12 15:40 ` Michal Hocko
2012-09-12 15:51 ` Catalin Marinas
2012-09-15 13:38 ` Ralf Baechle
2012-09-15 13:38 ` Ralf Baechle
2012-09-18 19:33 ` Andrew Morton
2012-09-19 9:12 ` Catalin Marinas
2012-09-19 15:53 ` Ralf Baechle
2012-09-20 12:44 ` Will Deacon
2012-09-20 12:44 ` Will Deacon
2012-09-20 19:32 ` David Miller
2012-09-11 16:47 ` [PATCH 3/3] mm: Introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE Will Deacon
2012-09-11 17:41 ` Kirill A. Shutemov
2012-09-12 15:32 ` Michal Hocko
2012-09-12 18:06 ` Chris Metcalf
2012-09-12 18:10 ` Will Deacon
2012-09-13 19:05 ` Andrew Morton
2012-09-13 21:26 ` Will Deacon
2012-09-13 21:26 ` Will Deacon
2012-09-13 21:27 ` Stephen Rothwell
2012-09-13 21:27 ` Stephen Rothwell
2012-09-13 21:40 ` Andrew Morton
2012-09-12 15:27 ` [PATCH 0/3] Minor changes to common hugetlb code for ARM Michal Hocko
2012-09-12 15:55 ` Will Deacon
2012-09-13 12:22 ` Michal Hocko
2012-09-13 0:12 ` Andrea Arcangeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347382036-18455-3-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=steve.capper@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).