The patch titled
memcontrol: move mm_cgroup to header file
has been removed from the -mm tree. Its filename was
memcontrol-move-mm_cgroup-to-header-file.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcontrol: move mm_cgroup to header file
From: David Rientjes <rientjes@xxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxx: build fix]
[akpm@xxxxxxxxxxxxxxxxxxxx: nuther build fix]
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 11 +++++++++--
mm/memcontrol.c | 5 -----
2 files changed, 9 insertions(+), 7 deletions(-)
diff -puN include/linux/memcontrol.h~memcontrol-move-mm_cgroup-to-header-file include/linux/memcontrol.h
--- a/include/linux/memcontrol.h~memcontrol-move-mm_cgroup-to-header-file
+++ a/include/linux/memcontrol.h
@@ -20,6 +20,9 @@
#ifndef _LINUX_MEMCONTROL_H
#define _LINUX_MEMCONTROL_H
+#include <linux/rcupdate.h>
+#include <linux/mm.h>
+
struct mem_cgroup;
struct page_cgroup;
struct page;
@@ -45,7 +48,11 @@ extern unsigned long mem_cgroup_isolate_
extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
gfp_t gfp_mask);
-extern struct mem_cgroup *mm_cgroup(struct mm_struct *mm);
+
+static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
+{
+ return rcu_dereference(mm->mem_cgroup);
+}
static inline void mem_cgroup_uncharge_page(struct page *page)
{
@@ -98,7 +105,7 @@ static inline int mem_cgroup_cache_charg
return 0;
}
-static inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm)
+static inline struct mem_cgroup *mm_cgroup(const struct mm_struct *mm)
{
return NULL;
}
diff -puN mm/memcontrol.c~memcontrol-move-mm_cgroup-to-header-file mm/memcontrol.c
--- a/mm/memcontrol.c~memcontrol-move-mm_cgroup-to-header-file
+++ a/mm/memcontrol.c
@@ -110,11 +110,6 @@ struct mem_cgroup *mem_cgroup_from_task(
struct mem_cgroup, css);
}
-inline struct mem_cgroup *mm_cgroup(struct mm_struct *mm)
-{
- return rcu_dereference(mm->mem_cgroup);
-}
-
void mm_init_cgroup(struct mm_struct *mm, struct task_struct *p)
{
struct mem_cgroup *mem;
_
Patches currently in -mm which might be from rientjes@xxxxxxxxxx are
origin.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-checkpatch-fixes.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-nommu-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
