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

Commit e2eef10e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: enable memory cgroups"

parents 0d395f34 7b8378ac

arch/arm/configs/msmcortex-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ CONFIG_CGROUPS=y 
CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

arch/arm/configs/msmcortex_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ CONFIG_CGROUP_DEBUG=y 
CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

arch/arm64/configs/msmcortex-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ CONFIG_CGROUPS=y 
CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

arch/arm64/configs/msmcortex_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ CONFIG_CGROUP_DEBUG=y 
CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

mm/memcontrol.c

+3 −3
Original line number Diff line number Diff line
@@ -2262,10 +2262,10 @@ again: 
 * @flags: value received from mem_cgroup_begin_page_stat()

 */

void mem_cgroup_end_page_stat(struct mem_cgroup *memcg, bool *locked,

			      unsigned long flags)

			      unsigned long *flags)

{

	if (memcg && *locked)

		move_unlock_mem_cgroup(memcg, &flags);

		move_unlock_mem_cgroup(memcg, flags);



	rcu_read_unlock();

}
@@ -4483,7 +4483,7 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, 
{

	struct mem_cgroup *memcg = mem_cgroup_from_css(css);



	if (val > 100)

	if ((val > 200) || ((val > 100) && !css->parent))

		return -EINVAL;



	if (css->parent)