Skip to content

Commit de09d31

Browse files
kiryltorvalds
authored andcommitted
page-flags: define PG_reserved behavior on compound pages
As far as I can see there's no users of PG_reserved on compound pages. Let's use PF_NO_COMPOUND here. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Rik van Riel <riel@redhat.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Christoph Lameter <cl@linux.com> Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Steve Capper <steve.capper@linaro.org> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Jerome Marchand <jmarchan@redhat.com> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: Hillf Danton <hillf.zj@alibaba-inc.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent c13985f commit de09d31

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

include/linux/page-flags.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ PAGEFLAG(Pinned, pinned, PF_NO_COMPOUND)
276276
PAGEFLAG(SavePinned, savepinned, PF_NO_COMPOUND);
277277
PAGEFLAG(Foreign, foreign, PF_NO_COMPOUND);
278278

279-
PAGEFLAG(Reserved, reserved, PF_ANY) __CLEARPAGEFLAG(Reserved, reserved, PF_ANY)
279+
PAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)
280+
__CLEARPAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)
280281
PAGEFLAG(SwapBacked, swapbacked, PF_ANY)
281282
__CLEARPAGEFLAG(SwapBacked, swapbacked, PF_ANY)
282283
__SETPAGEFLAG(SwapBacked, swapbacked, PF_ANY)

mm/hugetlb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,8 @@ static void prep_compound_gigantic_page(struct page *page, unsigned int order)
12671267

12681268
/* we rely on prep_new_huge_page to set the destructor */
12691269
set_compound_order(page, order);
1270-
__SetPageHead(page);
12711270
__ClearPageReserved(page);
1271+
__SetPageHead(page);
12721272
for (i = 1; i < nr_pages; i++, p = mem_map_next(p, page, i)) {
12731273
/*
12741274
* For gigantic hugepages allocated through bootmem at

0 commit comments

Comments
 (0)