]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
sh: switch to NO_BOOTMEM
authorRob Herring <robh@kernel.org>
Fri, 11 May 2018 13:45:59 +0000 (08:45 -0500)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 1 Oct 2018 12:58:12 +0000 (14:58 +0200)
commitb194a090e2c8b248a2a1bbf2e670cd6e34f3a606
treea5f5805a8cf7b2aa2dfd9cb32691769a0846b1ea
parentba3c8e1266f31574b2a8ddfb28a255901832d116
sh: switch to NO_BOOTMEM

BugLink: http://bugs.launchpad.net/bugs/1794889
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/sh/Kconfig
arch/sh/kernel/setup.c
arch/sh/mm/init.c
arch/sh/mm/numa.c