Breakout page_order() to internal.h to avoid special knowledge of the buddy allocator

[sfrench/cifs-2.6.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index d20e3cc4aef02d6d299c14cc52d5f2e875bbdb79..953f941ea8676a6f1768257428e8f917e75d7a2c 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -24,8 +24,8 @@ static inline void set_page_count(struct page *page, int v)
  */
 static inline void set_page_refcounted(struct page *page)
 {
-       BUG_ON(PageCompound(page) && page_private(page) != (unsigned long)page);
-       BUG_ON(atomic_read(&page->_count));
+       VM_BUG_ON(PageCompound(page) && PageTail(page));
+       VM_BUG_ON(atomic_read(&page->_count));
        set_page_count(page, 1);
 }
 
@@ -37,4 +37,14 @@ static inline void __put_page(struct page *page)
 extern void fastcall __init __free_pages_bootmem(struct page *page,
                                                unsigned int order);
 
+/*
+ * function for dealing with page's order in buddy system.
+ * zone->lock is already acquired when we use these.
+ * So, we don't need atomic page->flags operations here.
+ */
+static inline unsigned long page_order(struct page *page)
+{
+       VM_BUG_ON(!PageBuddy(page));
+       return page_private(page);
+}
 #endif