diff --git a/[refs] b/[refs] index 806384ff80e2..a306e164a1cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7ab795b7bec9997d4fde39f249d52823d36d98d +refs/heads/master: 617d2214ee06c209e5c375c280d50abace8058e1 diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h index 7d8c127daad7..6aa016f1d3ae 100644 --- a/trunk/include/linux/mm.h +++ b/trunk/include/linux/mm.h @@ -311,7 +311,7 @@ extern void FASTCALL(__page_cache_release(struct page *)); static inline int page_count(struct page *page) { - if (PageCompound(page)) + if (unlikely(PageCompound(page))) page = (struct page *)page_private(page); return atomic_read(&page->_count); }