* [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h
@ 2020-08-19 6:07 WANG Xuerui
2020-08-19 10:47 ` Huacai Chen
2020-08-21 7:46 ` Thomas Bogendoerfer
0 siblings, 2 replies; 3+ messages in thread
From: WANG Xuerui @ 2020-08-19 6:07 UTC (permalink / raw)
To: Huacai Chen, Thomas Bogendoerfer
Cc: WANG Xuerui, Jiaxun Yang, Youling Tang, linux-mips, linux-kernel
The couple of #includes are unused by now; remove to prevent namespace
pollution.
This fixes e.g. build of dm_thin, which has a VIRTUAL symbol that
conflicted with the newly-introduced one in mach-loongson64/boot_param.h.
Fixes: 39c1485c8baa ("MIPS: KVM: Add kvm guest support for Loongson-3")
Signed-off-by: WANG Xuerui <git@xen0n.name>
---
arch/mips/include/asm/mach-loongson64/irq.h | 2 --
arch/mips/include/asm/mach-loongson64/mmzone.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson64/irq.h b/arch/mips/include/asm/mach-loongson64/irq.h
index f5e362f79701..bf2480923154 100644
--- a/arch/mips/include/asm/mach-loongson64/irq.h
+++ b/arch/mips/include/asm/mach-loongson64/irq.h
@@ -2,8 +2,6 @@
#ifndef __ASM_MACH_LOONGSON64_IRQ_H_
#define __ASM_MACH_LOONGSON64_IRQ_H_
-#include <boot_param.h>
-
/* cpu core interrupt numbers */
#define NR_IRQS_LEGACY 16
#define NR_MIPS_CPU_IRQS 8
diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h
index 3a25dbd3b3e9..5eaca4fe3f92 100644
--- a/arch/mips/include/asm/mach-loongson64/mmzone.h
+++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
@@ -9,7 +9,6 @@
#ifndef _ASM_MACH_LOONGSON64_MMZONE_H
#define _ASM_MACH_LOONGSON64_MMZONE_H
-#include <boot_param.h>
#define NODE_ADDRSPACE_SHIFT 44
#define NODE0_ADDRSPACE_OFFSET 0x000000000000UL
#define NODE1_ADDRSPACE_OFFSET 0x100000000000UL
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h
2020-08-19 6:07 [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h WANG Xuerui
@ 2020-08-19 10:47 ` Huacai Chen
2020-08-21 7:46 ` Thomas Bogendoerfer
1 sibling, 0 replies; 3+ messages in thread
From: Huacai Chen @ 2020-08-19 10:47 UTC (permalink / raw)
To: WANG Xuerui
Cc: Thomas Bogendoerfer, Jiaxun Yang, Youling Tang, open list:MIPS,
LKML
Reviewed-by: Huacai Chen <chenhc@lemote.com>
On Wed, Aug 19, 2020 at 2:08 PM WANG Xuerui <git@xen0n.name> wrote:
>
> The couple of #includes are unused by now; remove to prevent namespace
> pollution.
>
> This fixes e.g. build of dm_thin, which has a VIRTUAL symbol that
> conflicted with the newly-introduced one in mach-loongson64/boot_param.h.
>
> Fixes: 39c1485c8baa ("MIPS: KVM: Add kvm guest support for Loongson-3")
> Signed-off-by: WANG Xuerui <git@xen0n.name>
> ---
> arch/mips/include/asm/mach-loongson64/irq.h | 2 --
> arch/mips/include/asm/mach-loongson64/mmzone.h | 1 -
> 2 files changed, 3 deletions(-)
>
> diff --git a/arch/mips/include/asm/mach-loongson64/irq.h b/arch/mips/include/asm/mach-loongson64/irq.h
> index f5e362f79701..bf2480923154 100644
> --- a/arch/mips/include/asm/mach-loongson64/irq.h
> +++ b/arch/mips/include/asm/mach-loongson64/irq.h
> @@ -2,8 +2,6 @@
> #ifndef __ASM_MACH_LOONGSON64_IRQ_H_
> #define __ASM_MACH_LOONGSON64_IRQ_H_
>
> -#include <boot_param.h>
> -
> /* cpu core interrupt numbers */
> #define NR_IRQS_LEGACY 16
> #define NR_MIPS_CPU_IRQS 8
> diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h
> index 3a25dbd3b3e9..5eaca4fe3f92 100644
> --- a/arch/mips/include/asm/mach-loongson64/mmzone.h
> +++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
> @@ -9,7 +9,6 @@
> #ifndef _ASM_MACH_LOONGSON64_MMZONE_H
> #define _ASM_MACH_LOONGSON64_MMZONE_H
>
> -#include <boot_param.h>
> #define NODE_ADDRSPACE_SHIFT 44
> #define NODE0_ADDRSPACE_OFFSET 0x000000000000UL
> #define NODE1_ADDRSPACE_OFFSET 0x100000000000UL
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h
2020-08-19 6:07 [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h WANG Xuerui
2020-08-19 10:47 ` Huacai Chen
@ 2020-08-21 7:46 ` Thomas Bogendoerfer
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-21 7:46 UTC (permalink / raw)
To: WANG Xuerui
Cc: Huacai Chen, Jiaxun Yang, Youling Tang, linux-mips, linux-kernel
On Wed, Aug 19, 2020 at 02:07:22PM +0800, WANG Xuerui wrote:
> The couple of #includes are unused by now; remove to prevent namespace
> pollution.
>
> This fixes e.g. build of dm_thin, which has a VIRTUAL symbol that
> conflicted with the newly-introduced one in mach-loongson64/boot_param.h.
>
> Fixes: 39c1485c8baa ("MIPS: KVM: Add kvm guest support for Loongson-3")
> Signed-off-by: WANG Xuerui <git@xen0n.name>
> ---
> arch/mips/include/asm/mach-loongson64/irq.h | 2 --
> arch/mips/include/asm/mach-loongson64/mmzone.h | 1 -
> 2 files changed, 3 deletions(-)
applied to mips-fixes.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-21 7:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-19 6:07 [PATCH] MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h WANG Xuerui
2020-08-19 10:47 ` Huacai Chen
2020-08-21 7:46 ` Thomas Bogendoerfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).