From 8b8764371f83ed9f41f2f8b1a8d9a5c30928acfa Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Wed, 22 Mar 2006 00:08:33 -0800
Subject: [PATCH] --- yaml --- r: 22472 b: refs/heads/master c:
 0f8053a509ceba4a077a50ea7b77039b5559b428 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/mm.h |  1 -
 trunk/mm/filemap.c       |  2 ++
 trunk/mm/internal.h      | 11 +++++++++++
 trunk/mm/vmscan.c        |  2 ++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76b41690d2c2..c3429f2724ba 100644
--- 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
index 1850cf8bad64..9b3cdfc8046d 100644
--- 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
index 44da3d476994..e8f58f7dd7a5 100644
--- 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
index 17256bb2f4ef..e3042db2a2d6 100644
--- 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
index 486184d2b50c..3914a94aa905 100644
--- 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 */