diff options
author | David Rientjes <rientjes@google.com> | 2008-02-07 03:14:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:19 -0500 |
commit | 3062fc67dad01b1d2a15d58c709eff946389eca4 (patch) | |
tree | 521b26bda2f6b106c8b3747a88214eec5f24b998 /include | |
parent | e1a1cd590e3fcb0d2e230128daf2337ea55387dc (diff) |
memcontrol: move mm_cgroup to header file
Inline functions must preceed their use, so mm_cgroup() should be defined
in linux/memcontrol.h.
include/linux/memcontrol.h:48: warning: 'mm_cgroup' declared inline after
being called
include/linux/memcontrol.h:48: warning: previous declaration of
'mm_cgroup' was here
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: nuther build fix]
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/memcontrol.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index cc0ad7191acd..4f580268b1b7 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -20,6 +20,9 @@ | |||
20 | #ifndef _LINUX_MEMCONTROL_H | 20 | #ifndef _LINUX_MEMCONTROL_H |
21 | #define _LINUX_MEMCONTROL_H | 21 | #define _LINUX_MEMCONTROL_H |
22 | 22 | ||
23 | #include <linux/rcupdate.h> | ||
24 | #include <linux/mm.h> | ||
25 | |||
23 | struct mem_cgroup; | 26 | struct mem_cgroup; |
24 | struct page_cgroup; | 27 | struct page_cgroup; |
25 | struct page; | 28 | struct page; |
@@ -45,7 +48,11 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan, | |||
45 | extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask); | 48 | extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask); |
46 | extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, | 49 | extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, |
47 | gfp_t gfp_mask); | 50 | gfp_t gfp_mask); |
48 | extern struct mem_cgroup *mm_cgroup(struct mm_struct *mm); | 51 | |
52 | static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm) | ||
53 | { | ||
54 | return rcu_dereference(mm->mem_cgroup); | ||
55 | } | ||
49 | 56 | ||
50 | static inline void mem_cgroup_uncharge_page(struct page *page) | 57 | static inline void mem_cgroup_uncharge_page(struct page *page) |
51 | { | 58 | { |
@@ -98,7 +105,7 @@ static inline int mem_cgroup_cache_charge(struct page *page, | |||
98 | return 0; | 105 | return 0; |
99 | } | 106 | } |
100 | 107 | ||
101 | static inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm) | 108 | static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm) |
102 | { | 109 | { |
103 | return NULL; | 110 | return NULL; |
104 | } | 111 | } |