---

yaml --- r: 22472 b: refs/heads/master c: 0f8053a h: refs/heads/master v: v3
git-mirror · Mar 22, 2006 · 8b87643 · 8b87643
1 parent 2705e3f
commit 8b87643
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa4f53bf92139595cae6f1a3d972fc0a3451d29
+refs/heads/master: 0f8053a509ceba4a077a50ea7b77039b5559b428
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
@@ -308,7 +308,6 @@ static inline int get_page_unless_zero(struct page *page)
 }
 
 #define set_page_count(p,v) 	atomic_set(&(p)->_count, (v))
-#define __put_page(p)		atomic_dec(&(p)->_count)
 
 extern void FASTCALL(__page_cache_release(struct page *));
 

diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -30,6 +30,8 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include "filemap.h"
+#include "internal.h"
+
 /*
  * FIXME: remove all knowledge of the buffer layer from the core VM
  */

diff --git a/trunk/mm/internal.h b/trunk/mm/internal.h
@@ -8,6 +8,10 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
+#ifndef __MM_INTERNAL_H
+#define __MM_INTERNAL_H
+
+#include <linux/mm.h>
 
 static inline void set_page_refs(struct page *page, int order)
 {
@@ -26,5 +30,12 @@ static inline void set_page_refs(struct page *page, int order)
 #endif /* CONFIG_MMU */
 }
 
+static inline void __put_page(struct page *page)
+{
+	atomic_dec(&page->_count);
+}
+
 extern void fastcall __init __free_pages_bootmem(struct page *page,
 						unsigned int order);
+
+#endif
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -39,6 +39,8 @@
 
 #include <linux/swapops.h>
 
+#include "internal.h"
+
 /* possible outcome of pageout() */
 typedef enum {
 	/* failed to write page out, page is locked */
-Original file line number
+Diff line change
@@ Expand Up / @@ -308,7 +308,6 @@ static inline int get_page_unless_zero(struct page *page) @@
     }
     #define set_page_count(p,v) 	atomic_set(&(p)->_count, (v))
-    #define __put_page(p)		atomic_dec(&(p)->_count)
     extern void FASTCALL(__page_cache_release(struct page *));
@@ Expand Down @@