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

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

Merge "lib: memtest: Add MEMTEST_ENABLE_DEFAULT option" into msm-4.9

parents 73f57f5b bdf06f72

lib/Kconfig.debug

+13 −0
Original line number Diff line number Diff line
@@ -2040,6 +2040,19 @@ config MEMTEST 
	        memtest=17, mean do 17 test patterns.

	  If you are unsure how to answer this question, answer N.



config MEMTEST_ENABLE_DEFAULT

	int "Enable Memtest pattern test by default? (0-17)"

	range 0 17

	default "0"

	depends on MEMTEST

	help

	  This option helps to select Memtest to be enabled through

	  kernel defconfig options. Alternatively it can be enabled

	  using memtest=<patterns> kernel command line.



	  Default value is kept as "0" so that it is kept as disabled.

	  To enable enter any value between 1-17 range.



config TEST_STATIC_KEYS

	tristate "Test static keys"

	default n

mm/memtest.c

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end) 
}



/* default is disabled */

static unsigned int memtest_pattern __initdata;



static unsigned int memtest_pattern __initdata =

		CONFIG_MEMTEST_ENABLE_DEFAULT;

static int __init parse_memtest(char *arg)

{

	int ret = 0;