Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 7bb3397798188af758947b19f0dc6dd945bf30d2..d527b80b292fc7d96308ab91f459dbe7bae874c8 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -13,8 +13,19 @@
 
 #include <linux/mm.h>
 
-static inline void set_page_refs(struct page *page, int order)
+static inline void set_page_count(struct page *page, int v)
 {
+       atomic_set(&page->_count, v);
+}
+
+/*
+ * Turn a non-refcounted page (->_count == 0) into refcounted with
+ * a count of one.
+ */
+static inline void set_page_refcounted(struct page *page)
+{
+       VM_BUG_ON(PageCompound(page) && page_private(page) != (unsigned long)page);
+       VM_BUG_ON(atomic_read(&page->_count));
        set_page_count(page, 1);
 }