diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2018-09-28 11:39:20 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-10-03 02:12:47 -0400 |
commit | d90fe2acd9b2900790da01354dbca48dba37c20d (patch) | |
tree | 30ae59b131a1a7d1ee92c06150b55bb1770e4133 /arch/powerpc/kernel/setup-common.c | |
parent | 803d690e68f0c5230183f1a42c7d50a41d16e380 (diff) |
powerpc: Wire up memtest
Add call to early_memtest() so that kernel compiled with
CONFIG_MEMTEST really perform memtest at startup when requested
via 'memtest' boot parameter.
Tested-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 93fa0c99681e..9ca9db707bcb 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/serial_8250.h> | 33 | #include <linux/serial_8250.h> |
34 | #include <linux/percpu.h> | 34 | #include <linux/percpu.h> |
35 | #include <linux/memblock.h> | 35 | #include <linux/memblock.h> |
36 | #include <linux/bootmem.h> | ||
36 | #include <linux/of_platform.h> | 37 | #include <linux/of_platform.h> |
37 | #include <linux/hugetlb.h> | 38 | #include <linux/hugetlb.h> |
38 | #include <asm/debugfs.h> | 39 | #include <asm/debugfs.h> |
@@ -966,6 +967,8 @@ void __init setup_arch(char **cmdline_p) | |||
966 | 967 | ||
967 | initmem_init(); | 968 | initmem_init(); |
968 | 969 | ||
970 | early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT); | ||
971 | |||
969 | #ifdef CONFIG_DUMMY_CONSOLE | 972 | #ifdef CONFIG_DUMMY_CONSOLE |
970 | conswitchp = &dummy_con; | 973 | conswitchp = &dummy_con; |
971 | #endif | 974 | #endif |