diff --git a/[refs] b/[refs] index d4fcc98b12f2..c6eb809957bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44e2aa937e698ea95dd86b2a4fabd734ef2c76db +refs/heads/master: 572438f9b52236bd8938b1647cc15e027d27ef55 diff --git a/trunk/mm/internal.h b/trunk/mm/internal.h index 6a697bb97fc5..dedb0aff673f 100644 --- a/trunk/mm/internal.h +++ b/trunk/mm/internal.h @@ -62,7 +62,7 @@ extern bool is_free_buddy_page(struct page *page); */ static inline unsigned long page_order(struct page *page) { - VM_BUG_ON(!PageBuddy(page)); + /* PageBuddy() must be checked by the caller */ return page_private(page); }