---

yaml --- r: 308877 b: refs/heads/master c: be9cd87 h: refs/heads/master i: 308875: 70a7a78 v: v3
git-mirror · May 29, 2012 · cdee434 · cdee434
1 parent eae87e0
commit cdee434
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 782182e53a6cdb3e3d04cc40516e173046942a32
+refs/heads/master: be9cd873e2a706a688e37224d48e135efd8c0d26
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -5972,6 +5972,9 @@ static struct trace_print_flags pageflag_names[] = {
 #endif
 #ifdef CONFIG_MEMORY_FAILURE
 	{1UL << PG_hwpoison,		"hwpoison"	},
+#endif
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+	{1UL << PG_compound_lock,	"compound_lock"	},
 #endif
 	{-1UL,				NULL		},
 };