From: Nick Piggin <npiggin@suse.de>

Remove __put_page from outside the core mm/.  It is dangerous because it does
not handle compound pages nicely, and misses 1->0 transitions.  If a user
later appears that really needs the extra speed we can reevaluate.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/mm.h |    1 -
 mm/filemap.c       |    2 ++
 mm/internal.h      |   11 +++++++++++
 mm/vmscan.c        |    2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff -puN include/linux/mm.h~mm-make-__put_page-internal include/linux/mm.h
--- devel/include/linux/mm.h~mm-make-__put_page-internal	2006-02-18 02:36:57.000000000 -0800
+++ devel-akpm/include/linux/mm.h	2006-02-18 02:36:57.000000000 -0800
@@ -308,7 +308,6 @@ static inline int get_page_unless_zero(s
 }
 
 #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 -puN mm/filemap.c~mm-make-__put_page-internal mm/filemap.c
--- devel/mm/filemap.c~mm-make-__put_page-internal	2006-02-18 02:36:57.000000000 -0800
+++ devel-akpm/mm/filemap.c	2006-02-18 02:36:57.000000000 -0800
@@ -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 -puN mm/internal.h~mm-make-__put_page-internal mm/internal.h
--- devel/mm/internal.h~mm-make-__put_page-internal	2006-02-18 02:36:57.000000000 -0800
+++ devel-akpm/mm/internal.h	2006-02-18 02:36:57.000000000 -0800
@@ -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 
 #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 -puN mm/vmscan.c~mm-make-__put_page-internal mm/vmscan.c
--- devel/mm/vmscan.c~mm-make-__put_page-internal	2006-02-18 02:36:57.000000000 -0800
+++ devel-akpm/mm/vmscan.c	2006-02-18 02:36:57.000000000 -0800
@@ -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 */
_