diff --git a/[refs] b/[refs] index 3a6e3b34c274..44a838127c39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45ec16908e84e00d847e9063231fb3a75e6366bc +refs/heads/master: 7795912c257bc068445f1db429c94d6b4b6ee604 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 993f7c1820a8..59a0059b39e2 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -671,6 +671,11 @@ static void prep_compound_gigantic_page(struct page *page, unsigned long order) } } +/* + * PageHuge() only returns true for hugetlbfs pages, but not for normal or + * transparent huge pages. See the PageTransHuge() documentation for more + * details. + */ int PageHuge(struct page *page) { compound_page_dtor *dtor;