diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-04-24 11:02:30 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-24 11:02:30 -0400 |
| commit | d3217ea1befbdf82f2d500460ded8def16678595 (patch) | |
| tree | f3f2aef388a4e7728b5ba9e95e1bcaa801265cd2 /mm/swap.c | |
| parent | 0204faac6aec38241afc0d9640ae17bc401bbca4 (diff) | |
| parent | 8f0c10ea2ec6e1086fbb73ff8bcbbf1ed8584b11 (diff) | |
Merge tag 'v3.10.36' into v3.10-rt
This is the 3.10.36 stable release
Diffstat (limited to 'mm/swap.c')
| -rw-r--r-- | mm/swap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swap.c b/mm/swap.c index 40b0b757116d..351b1cbf3d95 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -85,7 +85,7 @@ static void put_compound_page(struct page *page) { if (unlikely(PageTail(page))) { /* __split_huge_page_refcount can run under us */ - struct page *page_head = compound_trans_head(page); + struct page *page_head = compound_head(page); if (likely(page != page_head && get_page_unless_zero(page_head))) { @@ -223,7 +223,7 @@ bool __get_page_tail(struct page *page) */ unsigned long flags; bool got = false; - struct page *page_head = compound_trans_head(page); + struct page *page_head = compound_head(page); if (likely(page != page_head && get_page_unless_zero(page_head))) { /* Ref to put_compound_page() comment. */ |