---

yaml --- r: 332468 b: refs/heads/master c: 7a71932 h: refs/heads/master v: v3
git-mirror · Oct 9, 2012 · 29f6e7f · 29f6e7f
1 parent b038238
commit 29f6e7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd8ed2a45a401cb692d769e92de7d73aa42fabce
+refs/heads/master: 7a71932d5676b7410ab64d149bad8bde6b0d8632
diff --git a/trunk/fs/proc/page.c b/trunk/fs/proc/page.c
@@ -115,7 +115,13 @@ u64 stable_page_flags(struct page *page)
 		u |= 1 << KPF_COMPOUND_TAIL;
 	if (PageHuge(page))
 		u |= 1 << KPF_HUGE;
-	else if (PageTransCompound(page))
+	/*
+	 * PageTransCompound can be true for non-huge compound pages (slab
+	 * pages or pages allocated by drivers with __GFP_COMP) because it
+	 * just checks PG_head/PG_tail, so we need to check PageLRU to make
+	 * sure a given page is a thp, not a non-huge compound page.
+	 */
+	else if (PageTransCompound(page) && PageLRU(compound_trans_head(page)))
 		u |= 1 << KPF_THP;
 
 	/*