]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
sh: switch to NO_BOOTMEM
authorRob Herring <robh@kernel.org>
Fri, 11 May 2018 13:45:59 +0000 (08:45 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Jun 2018 19:01:41 +0000 (04:01 +0900)
commit42aa0ba07d072431297b9698b4f80ff953286e64
treed41d27a034b501ed0263cd75a50ea3de3e4b7680
parent7d1884ee250b0e179d73682b8ccaf9ac3e1a53d0
sh: switch to NO_BOOTMEM

[ Upstream commit ac21fc2dcb405cf250ad3f1228f64f64930d9211 ]

Commit 0fa1c579349f ("of/fdt: use memblock_virt_alloc for early alloc")
inadvertently switched the DT unflattening allocations from memblock to
bootmem which doesn't work because the unflattening happens before
bootmem is initialized. Swapping the order of bootmem init and
unflattening could also fix this, but removing bootmem is desired. So
enable NO_BOOTMEM on SH like other architectures have done.

Fixes: 0fa1c579349f ("of/fdt: use memblock_virt_alloc for early alloc")
Reported-by: Rich Felker <dalias@libc.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Rich Felker <dalias@libc.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/sh/Kconfig
arch/sh/kernel/setup.c
arch/sh/mm/init.c
arch/sh/mm/numa.c