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

Commit 4367382e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm/oom-kill: Remove obsolete IS_ENABLED check"

parents 41dfbf02 7e10ca7b

arch/arm64/configs/vendor/lahaina_debug.config

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_DEBUG_PAGEALLOC=y 
CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_PAGE_POISONING=y

CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y

CONFIG_PAGE_EXTENSION_PAGE_FREE=y

# CONFIG_DEBUG_DMA_BUF_REF is not set

# CONFIG_PAGE_POISONING_NO_SANITY is not set

# CONFIG_PAGE_POISONING_ZERO is not set

include/linux/oom.h

+2 −0
Original line number Diff line number Diff line
@@ -130,4 +130,6 @@ extern int sysctl_reap_mem_on_sigkill; 


/* calls for LMK reaper */

extern void add_to_oom_reaper(struct task_struct *p);

extern void check_panic_on_foreground_kill(struct task_struct *p);

#define ULMK_MAGIC "lmkd"

#endif /* _INCLUDE_LINUX_OOM_H */

include/linux/page_ext.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ struct page_ext_operations { 
enum page_ext_flags {

	PAGE_EXT_OWNER,

	PAGE_EXT_OWNER_ALLOCATED,

#ifdef CONFIG_PAGE_EXTENSION_PAGE_FREE

	PAGE_EXT_PG_FREE,

#endif

#if defined(CONFIG_IDLE_PAGE_TRACKING) && !defined(CONFIG_64BIT)

	PAGE_EXT_YOUNG,

	PAGE_EXT_IDLE,

kernel/signal.c

+1 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,7 @@ int group_send_sig_info(int sig, struct kernel_siginfo *info, 
	rcu_read_unlock();



	if (!ret && sig) {

		check_panic_on_foreground_kill(p);

		ret = do_send_sig_info(sig, info, p, type);

		if (capable(CAP_KILL) && sig == SIGKILL)

			add_to_oom_reaper(p);

mm/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -759,6 +759,17 @@ config PERCPU_STATS 
	  information includes global and per chunk statistics, which can

	  be used to help understand percpu memory usage.



config HAVE_USERSPACE_LOW_MEMORY_KILLER

	bool "Configure reclaim paths if there is a userspace LMK"

	default n

	help

	  Configures parts of the reclaim paths in the kernel when Android

	  has a userspace memory killer.  This configuration is done for

	  functional (e.g. ensuring the OOM killer doesn't run at certain

	  points) and performance purposes (e.g. preventing log-spew

	  when the OOM killer and userspace memory killer both have the

	  potential to run).



config GUP_BENCHMARK

	bool "Enable infrastructure for get_user_pages_fast() benchmarking"

	help