diff options
author | Nick Piggin <npiggin@suse.de> | 2006-03-22 03:08:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:54:01 -0500 |
commit | 0f8053a509ceba4a077a50ea7b77039b5559b428 (patch) | |
tree | 5a66021540395e20256f38a3a45174617428a832 /mm | |
parent | 4fa4f53bf92139595cae6f1a3d972fc0a3451d29 (diff) |
[PATCH] mm: make __put_page internal
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/internal.h | 11 | ||||
-rw-r--r-- | mm/vmscan.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 44da3d476994..e8f58f7dd7a5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include <linux/security.h> | 30 | #include <linux/security.h> |
31 | #include <linux/syscalls.h> | 31 | #include <linux/syscalls.h> |
32 | #include "filemap.h" | 32 | #include "filemap.h" |
33 | #include "internal.h" | ||
34 | |||
33 | /* | 35 | /* |
34 | * FIXME: remove all knowledge of the buffer layer from the core VM | 36 | * FIXME: remove all knowledge of the buffer layer from the core VM |
35 | */ | 37 | */ |
diff --git a/mm/internal.h b/mm/internal.h index 17256bb2f4ef..e3042db2a2d6 100644 --- a/mm/internal.h +++ b/mm/internal.h | |||
@@ -8,6 +8,10 @@ | |||
8 | * as published by the Free Software Foundation; either version | 8 | * as published by the Free Software Foundation; either version |
9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
10 | */ | 10 | */ |
11 | #ifndef __MM_INTERNAL_H | ||
12 | #define __MM_INTERNAL_H | ||
13 | |||
14 | #include <linux/mm.h> | ||
11 | 15 | ||
12 | static inline void set_page_refs(struct page *page, int order) | 16 | static inline void set_page_refs(struct page *page, int order) |
13 | { | 17 | { |
@@ -26,5 +30,12 @@ static inline void set_page_refs(struct page *page, int order) | |||
26 | #endif /* CONFIG_MMU */ | 30 | #endif /* CONFIG_MMU */ |
27 | } | 31 | } |
28 | 32 | ||
33 | static inline void __put_page(struct page *page) | ||
34 | { | ||
35 | atomic_dec(&page->_count); | ||
36 | } | ||
37 | |||
29 | extern void fastcall __init __free_pages_bootmem(struct page *page, | 38 | extern void fastcall __init __free_pages_bootmem(struct page *page, |
30 | unsigned int order); | 39 | unsigned int order); |
40 | |||
41 | #endif | ||
diff --git a/mm/vmscan.c b/mm/vmscan.c index 486184d2b50c..3914a94aa905 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -39,6 +39,8 @@ | |||
39 | 39 | ||
40 | #include <linux/swapops.h> | 40 | #include <linux/swapops.h> |
41 | 41 | ||
42 | #include "internal.h" | ||
43 | |||
42 | /* possible outcome of pageout() */ | 44 | /* possible outcome of pageout() */ |
43 | typedef enum { | 45 | typedef enum { |
44 | /* failed to write page out, page is locked */ | 46 | /* failed to write page out, page is locked */ |