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

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

Merge changes Idc41bd55,I1c76667e into msm-4.14 

* changes:
  defconfig: sdm855: Enable MEMCG for Android low memory killer
  mm, vmpressure: int cast vmpressure level/model for -1 comparison
parents abc10fe9 d508c3e6

arch/arm64/configs/sdm855-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ CONFIG_RCU_NOCB_CPU=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

arch/arm64/configs/sdm855_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ CONFIG_RCU_NOCB_CPU=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

mm/vmpressure.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int vmpressure_register_event(struct mem_cgroup *memcg, 
	/* Find required level */

	token = strsep(&spec, ",");

	level = str_to_level(token);

	if (level == -1) {

	if ((int)level == -1) {

		ret = -EINVAL;

		goto out;

	}
@@ -409,7 +409,7 @@ int vmpressure_register_event(struct mem_cgroup *memcg, 
	token = strsep(&spec, ",");

	if (token) {

		mode = str_to_mode(token);

		if (mode == -1) {

		if ((int)mode == -1) {

			ret = -EINVAL;

			goto out;

		}