Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bfcd13e authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

mm: hugetlbfs: use __compound_tail_refcounted in __get_page_tail too 



Also remove hugetlb.h which isn't needed anymore as PageHeadHuge is
handled in mm.h.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Pravin Shelar <pshelar@nicira.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 44518d2b

mm/swap.c

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/memcontrol.h>

#include <linux/gfp.h>

#include <linux/uio.h>

#include <linux/hugetlb.h>



#include "internal.h"
@@ -261,7 +260,7 @@ bool __get_page_tail(struct page *page) 
	struct page *page_head = compound_trans_head(page);



	/* Ref to put_compound_page() comment. */

	if (PageSlab(page_head) || PageHeadHuge(page_head)) {

	if (!__compound_tail_refcounted(page_head)) {

		smp_rmb();

		if (likely(PageTail(page))) {

			/*