summaryrefslogtreecommitdiff
path: root/fs/proc/page.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-03-31 20:17:33 +0400
committerRalf Baechle <ralf@linux-mips.org>2014-03-31 20:17:33 +0400
commitade63aada79c61bcd5f51cbd310f237399892268 (patch)
tree4f8605528bfd9b6261679883974b9ac4870223dd /fs/proc/page.c
parent9a1724c7506bfa7d3d9dcab13f83e9e6446929f9 (diff)
parentc14af233fbe279d0e561ecf84f1208b1bae087ef (diff)
downloadlinux-ade63aada79c61bcd5f51cbd310f237399892268.tar.xz
Merge branch '3.14-fixes' into mips-for-linux-next
Diffstat (limited to 'fs/proc/page.c')
-rw-r--r--fs/proc/page.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/proc/page.c b/fs/proc/page.c
index 02174a610315..e647c55275d9 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -121,9 +121,8 @@ u64 stable_page_flags(struct page *page)
* just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon
* to make sure a given page is a thp, not a non-huge compound page.
*/
- else if (PageTransCompound(page) &&
- (PageLRU(compound_trans_head(page)) ||
- PageAnon(compound_trans_head(page))))
+ else if (PageTransCompound(page) && (PageLRU(compound_head(page)) ||
+ PageAnon(compound_head(page))))
u |= 1 << KPF_THP;
/*