From eb6b6930a70faefe04479a71088cc10366782d9a Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 31 Jul 2017 01:27:50 -0400 Subject: sh: fix memory corruption of unflattened device tree unflatten_device_tree() makes use of memblock allocation, and therefore must be called before paging_init() migrates the memblock allocation data to the bootmem framework. Otherwise the record of the allocation for the expanded device tree will be lost, and will eventually be clobbered when allocated for another use. Signed-off-by: Rich Felker --- arch/sh/boards/of-generic.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'arch/sh/boards') diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c index 4feb7c86f4ac..46b2481eec90 100644 --- a/arch/sh/boards/of-generic.c +++ b/arch/sh/boards/of-generic.c @@ -126,12 +126,6 @@ static void __init sh_of_setup(char **cmdline_p) { struct device_node *root; -#ifdef CONFIG_USE_BUILTIN_DTB - unflatten_and_copy_device_tree(); -#else - unflatten_device_tree(); -#endif - board_time_init = sh_of_time_init; sh_mv.mv_name = "Unknown SH model"; -- cgit v1.2.3