MIPS: Loongson64: Fix boot failure after dropping boot_mem_map
authorHuacai Chen <chenhc@lemote.com>
Fri, 27 Sep 2019 10:27:42 +0000 (18:27 +0800)
committerPaul Burton <paul.burton@mips.com>
Mon, 30 Sep 2019 22:18:22 +0000 (15:18 -0700)
commit2b6509f42dc6c96ef0b625888d4aa56d2e140330
tree07620843a196adebdd8dee23a25db5c29425a3a0
parent54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c
MIPS: Loongson64: Fix boot failure after dropping boot_mem_map

From commit a94e4f24ec83 ("MIPS: init: Drop boot_mem_map") onwards,
add_memory_region() is handled by memblock_add()/memblock_reserve()
directly and all bootmem API should be converted to memblock API.
Otherwise it will lead to boot failure, especially in the NUMA case
because add_memory_region lose the node_id information.

Fixes: a94e4f24ec836c8984f83959 ("MIPS: init: Drop boot_mem_map")
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
[paul.burton@mips.com:
  - Invert node_id check to de-indent the switch statement & avoid lines
    over 80 characters.
  - Fixup commit reference in commit message.]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: linux-mips@vger.kernel.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Huacai Chen <chenhuacai@gmail.com>
arch/mips/loongson64/common/mem.c
arch/mips/loongson64/loongson-3/numa.c