X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Finternal.h;h=5a9a6200e034fb43aad09efe34ac1b2e49825509;hb=e338d263a76af78fe8f38a72131188b58fceb591;hp=d20e3cc4aef02d6d299c14cc52d5f2e875bbdb79;hpb=8b4b6707ee32f929846d947d18b1b9bf42e988aa;p=cascardo%2Flinux.git

diff --git a/mm/internal.h b/mm/internal.h
index d20e3cc4aef0..5a9a6200e034 100644
--- 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(PageTail(page));
+	VM_BUG_ON(atomic_read(&page->_count));
 	set_page_count(page, 1);
 }
 
@@ -34,7 +34,17 @@ static inline void __put_page(struct page *page)
 	atomic_dec(&page->_count);
 }
 
-extern void fastcall __init __free_pages_bootmem(struct page *page,
+extern void __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