From: James Hogan <jhogan@kernel.org>
To: Huacai Chen <chenhc@lemote.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
"Steven J . Hill" <Steven.Hill@cavium.com>,
linux-mips@linux-mips.org, Fuxin Zhang <zhangfx@lemote.com>,
Zhangjin Wu <wuzhangjin@gmail.com>,
YunQiang Su <yunqiang.su@imgtec.com>
Subject: Re: [PATCH 1/2] MIPS: Loongson fix name confict - MEM_RESERVED
Date: Thu, 1 Feb 2018 16:20:58 +0000 [thread overview]
Message-ID: <20180201162057.GP7637@saruman> (raw)
In-Reply-To: <1510821304-24626-1-git-send-email-chenhc@lemote.com>
[-- Attachment #1: Type: text/plain, Size: 2442 bytes --]
On Thu, Nov 16, 2017 at 04:35:04PM +0800, Huacai Chen wrote:
> 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>
Applied to my 4.16 branch.
Thanks
James
> ---
> arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +-
> arch/mips/loongson64/common/mem.c | 2 +-
> arch/mips/loongson64/loongson-3/numa.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/include/asm/mach-loongson64/boot_param.h b/arch/mips/include/asm/mach-loongson64/boot_param.h
> index 4f69f08..8c286be 100644
> --- a/arch/mips/include/asm/mach-loongson64/boot_param.h
> +++ b/arch/mips/include/asm/mach-loongson64/boot_param.h
> @@ -4,7 +4,7 @@
>
> #define SYSTEM_RAM_LOW 1
> #define SYSTEM_RAM_HIGH 2
> -#define MEM_RESERVED 3
> +#define SYSTEM_RAM_RESERVED 3
> #define PCI_IO 4
> #define PCI_MEM 5
> #define LOONGSON_CFG_REG 6
> diff --git a/arch/mips/loongson64/common/mem.c b/arch/mips/loongson64/common/mem.c
> index b01d524..c549e52 100644
> --- a/arch/mips/loongson64/common/mem.c
> +++ b/arch/mips/loongson64/common/mem.c
> @@ -79,7 +79,7 @@ void __init prom_init_memory(void)
> (u64)loongson_memmap->map[i].mem_size << 20,
> BOOT_MEM_RAM);
> break;
> - case MEM_RESERVED:
> + case SYSTEM_RAM_RESERVED:
> add_memory_region(loongson_memmap->map[i].mem_start,
> (u64)loongson_memmap->map[i].mem_size << 20,
> BOOT_MEM_RESERVED);
> diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c
> index f17ef52..9717106 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,
> --
> 2.7.0
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2018-02-01 16:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 8:35 [PATCH 1/2] MIPS: Loongson fix name confict - MEM_RESERVED Huacai Chen
2018-01-24 13:32 ` James Hogan
2018-02-01 16:20 ` James Hogan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180201162057.GP7637@saruman \
--to=jhogan@kernel.org \
--cc=Steven.Hill@cavium.com \
--cc=chenhc@lemote.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=wuzhangjin@gmail.com \
--cc=yunqiang.su@imgtec.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox