* [PATCH] MIPS: Loongson fix name confict - MEM_RESERVED
@ 2017-08-13 12:44 YunQiang Su
2017-08-14 6:21 ` Huacai Chen
0 siblings, 1 reply; 4+ messages in thread
From: YunQiang Su @ 2017-08-13 12:44 UTC (permalink / raw)
To: linux-mips; +Cc: YunQiang Su
From: YunQiang Su <yunqiang.su@imgtec.com>
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 LOONGSON_MEM_RESERVED in Loongson code.
---
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 9f9bb9c53785..595a949e5f47 100644
--- a/arch/mips/include/asm/mach-loongson64/boot_param.h
+++ b/arch/mips/include/asm/mach-loongson64/boot_param.h
@@ -3,7 +3,7 @@
#define SYSTEM_RAM_LOW 1
#define SYSTEM_RAM_HIGH 2
-#define MEM_RESERVED 3
+#define LOONGSON_MEM_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 b01d52473da8..6c97dbe2cb85 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 LOONGSON_MEM_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 f17ef520799a..3ceb401f7691 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 LOONGSON_MEM_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.14.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] MIPS: Loongson fix name confict - MEM_RESERVED
2017-08-13 12:44 [PATCH] MIPS: Loongson fix name confict - MEM_RESERVED YunQiang Su
@ 2017-08-14 6:21 ` Huacai Chen
2017-08-16 12:05 ` Ralf Baechle
0 siblings, 1 reply; 4+ messages in thread
From: Huacai Chen @ 2017-08-14 6:21 UTC (permalink / raw)
To: YunQiang Su; +Cc: Linux MIPS Mailing List, YunQiang Su
Hi, Yunqiang
Please rename it to SYSTEM_RAM_RESERVED, thanks.
Huacai
On Sun, Aug 13, 2017 at 8:44 PM, YunQiang Su <syq@debian.org> wrote:
> From: YunQiang Su <yunqiang.su@imgtec.com>
>
> 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 LOONGSON_MEM_RESERVED in Loongson code.
> ---
> 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 9f9bb9c53785..595a949e5f47 100644
> --- a/arch/mips/include/asm/mach-loongson64/boot_param.h
> +++ b/arch/mips/include/asm/mach-loongson64/boot_param.h
> @@ -3,7 +3,7 @@
>
> #define SYSTEM_RAM_LOW 1
> #define SYSTEM_RAM_HIGH 2
> -#define MEM_RESERVED 3
> +#define LOONGSON_MEM_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 b01d52473da8..6c97dbe2cb85 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 LOONGSON_MEM_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 f17ef520799a..3ceb401f7691 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 LOONGSON_MEM_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.14.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] MIPS: Loongson fix name confict - MEM_RESERVED
@ 2017-08-17 3:49 Huacai Chen
0 siblings, 0 replies; 4+ messages in thread
From: Huacai Chen @ 2017-08-17 3:49 UTC (permalink / raw)
To: Ralf Baechle
Cc: John Crispin, Steven J . Hill, linux-mips, Fuxin Zhang,
Zhangjin Wu, Huacai Chen, YunQiang Su
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>
---
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 6faa76d..7f66760 100644
--- a/arch/mips/include/asm/mach-loongson64/boot_param.h
+++ b/arch/mips/include/asm/mach-loongson64/boot_param.h
@@ -3,7 +3,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 4022a35..65169ee 100644
--- a/arch/mips/loongson64/common/mem.c
+++ b/arch/mips/loongson64/common/mem.c
@@ -86,7 +86,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 2e93cd2..416a489 100644
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -175,7 +175,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
C\x01\x01
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-17 3:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-13 12:44 [PATCH] MIPS: Loongson fix name confict - MEM_RESERVED YunQiang Su
2017-08-14 6:21 ` Huacai Chen
2017-08-16 12:05 ` Ralf Baechle
-- strict thread matches above, loose matches on Subject: below --
2017-08-17 3:49 Huacai Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox