diff options
-rw-r--r-- | include/linux/mm.h | 1 | ||||
-rw-r--r-- | mm/filemap.c | 2 | ||||
-rw-r--r-- | mm/internal.h | 11 | ||||
-rw-r--r-- | mm/vmscan.c | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1850cf8bad64..9b3cdfc8046d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -308,7 +308,6 @@ static inline int get_page_unless_zero(struct page *page) | |||
308 | } | 308 | } |
309 | 309 | ||
310 | #define set_page_count(p,v) atomic_set(&(p)->_count, (v)) | 310 | #define set_page_count(p,v) atomic_set(&(p)->_count, (v)) |
311 | #define __put_page(p) atomic_dec(&(p)->_count) | ||
312 | 311 | ||
313 | extern void FASTCALL(__page_cache_release(struct page *)); | 312 | extern void FASTCALL(__page_cache_release(struct page *)); |
314 | 313 | ||
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 */ |