|
|
@@ -92,7 +92,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
|
|
}
|
|
|
--- a/include/linux/cgroup.h
|
|
|
+++ b/include/linux/cgroup.h
|
|
|
-@@ -432,6 +432,18 @@ static inline void cgroup_put(struct cgr
|
|
|
+@@ -433,6 +433,18 @@ static inline void cgroup_put(struct cgr
|
|
|
css_put(&cgrp->self);
|
|
|
}
|
|
|
|
|
|
@@ -111,7 +111,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
|
|
/**
|
|
|
* task_css_set_check - obtain a task's css_set with extra access conditions
|
|
|
* @task: the task to obtain css_set for
|
|
|
-@@ -446,7 +458,6 @@ static inline void cgroup_put(struct cgr
|
|
|
+@@ -447,7 +459,6 @@ static inline void cgroup_put(struct cgr
|
|
|
* as locks used during the cgroup_subsys::attach() methods.
|
|
|
*/
|
|
|
#ifdef CONFIG_PROVE_RCU
|
|
|
@@ -119,7 +119,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
|
|
extern spinlock_t css_set_lock;
|
|
|
#define task_css_set_check(task, __c) \
|
|
|
rcu_dereference_check((task)->cgroups, \
|
|
|
-@@ -707,6 +718,8 @@ struct cgroup;
|
|
|
+@@ -708,6 +719,8 @@ struct cgroup;
|
|
|
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
|
|
|
static inline void css_get(struct cgroup_subsys_state *css) {}
|
|
|
static inline void css_put(struct cgroup_subsys_state *css) {}
|
|
|
@@ -593,7 +593,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
|
|
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
|
|
|
--- a/mm/memcontrol.c
|
|
|
+++ b/mm/memcontrol.c
|
|
|
-@@ -5226,6 +5226,7 @@ static struct mem_cgroup *mem_cgroup_all
|
|
|
+@@ -5237,6 +5237,7 @@ static struct mem_cgroup *mem_cgroup_all
|
|
|
memcg->deferred_split_queue.split_queue_len = 0;
|
|
|
#endif
|
|
|
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);
|