diff options
-rw-r--r-- | include/linux/memcontrol.h | 1 | ||||
-rw-r--r-- | mm/memcontrol.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ad800e62cb7a..6452ff4c463f 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -242,7 +242,6 @@ struct mem_cgroup { | |||
242 | * percpu counter. | 242 | * percpu counter. |
243 | */ | 243 | */ |
244 | struct mem_cgroup_stat_cpu __percpu *stat; | 244 | struct mem_cgroup_stat_cpu __percpu *stat; |
245 | spinlock_t pcp_counter_lock; | ||
246 | 245 | ||
247 | #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET) | 246 | #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET) |
248 | struct cg_proto tcp_mem; | 247 | struct cg_proto tcp_mem; |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 03cc0a742ff1..1fedbde68f59 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -4185,7 +4185,6 @@ static struct mem_cgroup *mem_cgroup_alloc(void) | |||
4185 | if (memcg_wb_domain_init(memcg, GFP_KERNEL)) | 4185 | if (memcg_wb_domain_init(memcg, GFP_KERNEL)) |
4186 | goto out_free_stat; | 4186 | goto out_free_stat; |
4187 | 4187 | ||
4188 | spin_lock_init(&memcg->pcp_counter_lock); | ||
4189 | return memcg; | 4188 | return memcg; |
4190 | 4189 | ||
4191 | out_free_stat: | 4190 | out_free_stat: |