diff options
| author | Andrea Arcangeli <aarcange@redhat.com> | 2014-01-21 15:48:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 16:19:43 -0800 |
| commit | 3bfcd13ec0b43b39b02072ba67bf197d15379387 (patch) | |
| tree | 0d8f2cf3c18035936c746758be4d49a9a9844a1f | |
| parent | 44518d2b32646e37b4b7a0813bbbe98dc21c7f8f (diff) | |
| download | linux-3bfcd13ec0b43b39b02072ba67bf197d15379387.tar.gz linux-3bfcd13ec0b43b39b02072ba67bf197d15379387.tar.bz2 linux-3bfcd13ec0b43b39b02072ba67bf197d15379387.zip | |
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: Andrea 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/swap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/swap.c b/mm/swap.c index bba4aa5bf686..7434e3619c14 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -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))) { /* |