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

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

Merge "lowmemorykiller: fix an uninitialized variable usage"

parents b728b32d 8da30149

arch/arm/configs/msmfalcon-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

CONFIG_SCHED_HMP_CSTATE_AWARE=y
@@ -59,6 +61,7 @@ CONFIG_CLEANCACHE=y 
CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

CONFIG_PROCESS_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

# CONFIG_CPU_FREQ_STAT is not set
@@ -262,7 +265,6 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_RNDIS_IPA=y

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

arch/arm/configs/msmfalcon_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y
@@ -59,6 +61,7 @@ CONFIG_CLEANCACHE=y 
CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

CONFIG_PROCESS_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y

# CONFIG_CPU_FREQ_STAT is not set
@@ -261,7 +264,6 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_RNDIS_IPA=y

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

arch/arm64/configs/msmfalcon-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y

CONFIG_SCHED_HMP_CSTATE_AWARE=y
@@ -58,6 +60,7 @@ CONFIG_CMA_DEBUGFS=y 
CONFIG_ZSMALLOC=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y

CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y

CONFIG_PROCESS_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y
@@ -604,7 +607,6 @@ CONFIG_DEBUG_RODATA=y 
CONFIG_DEBUG_ALIGN_RODATA=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_LINKS_AND_SINKS=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_QCOM_REPLICATOR=y

CONFIG_CORESIGHT_STM=y

arch/arm64/configs/msmfalcon_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_SCHED_HMP=y
@@ -57,6 +59,7 @@ CONFIG_CLEANCACHE=y 
CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y

CONFIG_ZSMALLOC=y

CONFIG_PROCESS_RECLAIM=y

CONFIG_SECCOMP=y

CONFIG_ARMV8_DEPRECATED=y

CONFIG_SWP_EMULATION=y
@@ -258,7 +261,6 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_RNDIS_IPA=y

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

drivers/staging/android/lowmemorykiller.c

+5 −0
Original line number Diff line number Diff line
@@ -179,6 +179,11 @@ static int lmk_vmpressure_notifier(struct notifier_block *nb, 
			trace_almk_vmpressure(pressure, other_free, other_file);

		}

	} else if (atomic_read(&shift_adj)) {

		other_file = global_page_state(NR_FILE_PAGES) + zcache_pages() -

			global_page_state(NR_SHMEM) -

			total_swapcache_pages();

		other_free = global_page_state(NR_FREE_PAGES);



		/*

		 * shift_adj would have been set by a previous invocation

		 * of notifier, which is not followed by a lowmem_shrink yet.