diff --git a/[refs] b/[refs] index f3d2062cc4ca..edcef0fa5fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14fd403f2146f740942d78af4e0ee59396ad8eab +refs/heads/master: 59ff421631295cd54dbf75dcc53d27e84af6d9c0 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 8be81422d4bd..6e62d5f9d40b 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -357,6 +357,7 @@ void prep_compound_page(struct page *page, unsigned long order) } } +/* update __split_huge_page_refcount if you change this function */ static int destroy_compound_page(struct page *page, unsigned long order) { int i;