| Message ID | 20200819060722.2267677-1-git@xen0n.name (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 77b3275c8f64276052f83a38dc965c56861108e1 |
| Headers | show |
| Series | MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h | expand |
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 >
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.
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
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(-)