diff --git a/[refs] b/[refs] index 0385bd015ad6..3109e645c8e0 100644 --- 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 index 457b4de122f4..72869ea5c513 100644 --- 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 }, };