diff options
| author |   Huacai Chen <chenhc@lemote.com> | 2017-11-16 16:35:04 +0800 |
|---|---|---|
| committer |   James Hogan <jhogan@kernel.org> | 2018-01-24 13:34:39 +0000 |
| commit | 6045f241b48f07b2fb80905bf49671f457a8c037 (patch) | |
| tree | f88698dee85592039c35f30741e87843836c4b12 /arch/mips/loongson64/loongson-3/numa.c | |
| parent | MIPS: bcm47xx: enable ZBOOT support (diff) | |
| download | linux-dev-6045f241b48f07b2fb80905bf49671f457a8c037.tar.xz linux-dev-6045f241b48f07b2fb80905bf49671f457a8c037.zip | |
MIPS: Loongson fix name confict - MEM_RESERVED
MEM_RESERVED is used as a value of enum mem_type in include/linux/
edac.h. This will make failure to build for Loongson in some case:
for example with CONFIG_RAS enabled.
So here rename MEM_RESERVED to SYSTEM_RAM_RESERVED in Loongson code.
Signed-off-by: YunQiang Su <yunqiang.su@imgtec.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17724/
Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'arch/mips/loongson64/loongson-3/numa.c')
| -rw-r--r-- | arch/mips/loongson64/loongson-3/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c index f17ef520799a..9717106de4a5 100644 --- a/arch/mips/loongson64/loongson-3/numa.c +++ b/arch/mips/loongson64/loongson-3/numa.c @@ -166,7 +166,7 @@ static void __init szmem(unsigned int node) memblock_add_node(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn), node); break; - case MEM_RESERVED: + case SYSTEM_RAM_RESERVED: pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n", (u32)node_id, mem_type, mem_start, mem_size); add_memory_region((node_id << 44) + mem_start, |