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

Commit 6c867465 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: run the showmem notifier in alloc failure"

parents ea1b6187 17e3983d

arch/arm/include/asm/thread_info.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, 
#define TIF_USING_IWMMXT	17

#define TIF_MEMDIE		18	/* is terminating due to OOM killer */

#define TIF_RESTORE_SIGMASK	20

#define TIF_MM_RELEASED	21	/* task MM has been released */



#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

arch/arm64/configs/vendor/sm8150-perf_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 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_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y
@@ -468,6 +466,7 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

arch/arm64/configs/vendor/sm8150_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 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_BLK_CGROUP=y

CONFIG_DEBUG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y
@@ -490,6 +488,7 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

arch/um/include/asm/thread_info.h

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static inline struct thread_info *current_thread_info(void) 
#define TIF_RESTORE_SIGMASK	7

#define TIF_NOTIFY_RESUME	8

#define TIF_SECCOMP		9	/* secure computing */

#define TIF_MM_RELEASED         10	/* task MM has been released */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

drivers/staging/android/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,15 @@ config ANDROID_LOW_MEMORY_KILLER 
	  scripts (/init.rc), and it defines priority values with minimum free memory size

	  for each priority.



config ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES

	bool "Android Low Memory Killer: detect oom_adj values"

	depends on ANDROID_LOW_MEMORY_KILLER

	default y

	---help---

	  Detect oom_adj values written to

	  /sys/module/lowmemorykiller/parameters/adj and convert them

	  to oom_score_adj values.



source "drivers/staging/android/ion/Kconfig"



source "drivers/staging/android/fiq_debugger/Kconfig"