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

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

Merge "Kconfig: memtest: update number of test patterns up to 17"

parents b1001767 256714a5

arch/arm/mm/init.c

+3 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ void __init bootmem_init(void) 


	find_limits(&min, &max_low, &max_high);



	early_memtest((phys_addr_t)min << PAGE_SHIFT,

		      (phys_addr_t)max_low << PAGE_SHIFT);



	/*

	 * Sparsemem tries to allocate bootmem in memory_present(),

	 * so must be done after the fixed reservations

arch/arm64/mm/init.c

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ void __init bootmem_init(void) 
	min = PFN_UP(memblock_start_of_DRAM());

	max = PFN_DOWN(memblock_end_of_DRAM());



	early_memtest(min << PAGE_SHIFT, max << PAGE_SHIFT);



	/*

	 * Sparsemem tries to allocate bootmem in memory_present(), so must be

	 * done after the fixed reservations.

arch/x86/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -691,17 +691,6 @@ endif #HYPERVISOR_GUEST 
config NO_BOOTMEM

	def_bool y



config MEMTEST

	bool "Memtest"

	---help---

	  This option adds a kernel parameter 'memtest', which allows memtest

	  to be set.

	        memtest=0, mean disabled; -- default

	        memtest=1, mean do 1 test pattern;

	        ...

	        memtest=4, mean do 4 test patterns.

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



source "arch/x86/Kconfig.cpu"



config HPET_TIMER

arch/x86/include/asm/e820.h

+0 −8
Original line number Diff line number Diff line
@@ -40,14 +40,6 @@ static inline void e820_mark_nosave_regions(unsigned long limit_pfn) 
}

#endif



#ifdef CONFIG_MEMTEST

extern void early_memtest(unsigned long start, unsigned long end);

#else

static inline void early_memtest(unsigned long start, unsigned long end)

{

}

#endif



extern unsigned long e820_end_of_ram_pfn(void);

extern unsigned long e820_end_of_low_ram_pfn(void);

extern u64 early_reserve_e820(u64 sizet, u64 align);

arch/x86/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,3 +33,4 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o 
obj-$(CONFIG_NUMA_EMU)		+= numa_emulation.o



obj-$(CONFIG_MEMTEST)		+= memtest.o

obj-$(CONFIG_X86_INTEL_MPX)	+= mpx.o