summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2012-08-22 10:34:08 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 10:30:09 -0700
commit870fefcd916e9766ff3ac689aa87e9f3abbe9381 (patch)
tree51ff1eb80eecc8be6c8f4e21b9573f30f9e7aad6
parent0ed92b21f3807633c70f7565f92b034ef8bf4b1c (diff)
MIPS: mm: Add compound tail page _mapcount when mapped
commit af89fa3986b9d034a286544ab1ed95096496a2f9 upstream. See commit b6999b191 which did the same modification for x86's mm/gup, Quote from commit b6999b191: "If compound pages are used and the page is a tail page, gup_huge_pmd() increases _mapcount to record tail page are mapped while gup_huge_pud does not do that." [ralf@linux-mips.org: fixed rejects caused by the original patch getting linewrapped.] Signed-off-by: Jovi Zhang <boojovi@gmail.com> Cc: Youquan Song <youquan.song@intel.com> Cc: Andi Kleen <andi@firstfloor.org> Patchwork: https://patchwork.linux-mips.org/patch/4291/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/mips/mm/gup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index 33aadbcf170b..dcfd573871c1 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -152,6 +152,8 @@ static int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end,
do {
VM_BUG_ON(compound_head(page) != head);
pages[*nr] = page;
+ if (PageTail(page))
+ get_huge_page_tail(page);
(*nr)++;
page++;
refs++;