Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef510194 authored by Greg Thelen's avatar Greg Thelen Committed by Linus Torvalds
Browse files

memcg: remove pcp_counter_lock 



Commit 733a572e ("memcg: make mem_cgroup_read_{stat|event}() iterate
possible cpus instead of online") removed the last use of the per memcg
pcp_counter_lock but forgot to remove the variable.

Kill the vestigial variable.

Signed-off-by: default avatarGreg Thelen <gthelen@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54aea454

include/linux/memcontrol.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ struct mem_cgroup { 
	 * percpu counter.

	 */

	struct mem_cgroup_stat_cpu __percpu *stat;

	spinlock_t pcp_counter_lock;



#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)

	struct cg_proto tcp_mem;

mm/memcontrol.c

+0 −1
Original line number Diff line number Diff line
@@ -4185,7 +4185,6 @@ static struct mem_cgroup *mem_cgroup_alloc(void) 
	if (memcg_wb_domain_init(memcg, GFP_KERNEL))

		goto out_free_stat;



	spin_lock_init(&memcg->pcp_counter_lock);

	return memcg;



out_free_stat: