Commit cf592bf7 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds

powerpc: gup_huge_pmd() return 0 if pte changes

powerpc didn't return 0 in that case, if it's rolling back the *nr pointer
it should also return zero to avoid adding pages to the array at the wrong
offset.
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3526741f
...@@ -443,17 +443,18 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add ...@@ -443,17 +443,18 @@ static noinline int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long add
*nr -= refs; *nr -= refs;
while (refs--) while (refs--)
put_page(head); put_page(head);
} else { return 0;
}
/* /*
* Any tail page need their mapcount reference taken * Any tail page need their mapcount reference taken before we
* before we return. * return.
*/ */
while (refs--) { while (refs--) {
if (PageTail(tail)) if (PageTail(tail))
get_huge_page_tail(tail); get_huge_page_tail(tail);
tail++; tail++;
} }
}
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment