* [PATCH 1/3] loongarch: remove unneeded #include <asm/export.h> @ 2023-08-07 15:42 Masahiro Yamada 2023-08-07 15:42 ` [PATCH 2/3] loongarch: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada 2023-08-07 15:42 ` [PATCH 3/3] loongarch: remove <asm/export.h> Masahiro Yamada 0 siblings, 2 replies; 5+ messages in thread From: Masahiro Yamada @ 2023-08-07 15:42 UTC (permalink / raw) To: Huacai Chen, WANG Xuerui, loongarch Cc: linux-kernel, linux-arch, Masahiro Yamada There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> is unneeded. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/loongarch/kernel/mcount_dyn.S | 1 - arch/loongarch/lib/unaligned.S | 1 - arch/loongarch/mm/tlbex.S | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S index e16ab0b98e5a..482aa553aa2d 100644 --- a/arch/loongarch/kernel/mcount_dyn.S +++ b/arch/loongarch/kernel/mcount_dyn.S @@ -3,7 +3,6 @@ * Copyright (C) 2022 Loongson Technology Corporation Limited */ -#include <asm/export.h> #include <asm/ftrace.h> #include <asm/regdef.h> #include <asm/stackframe.h> diff --git a/arch/loongarch/lib/unaligned.S b/arch/loongarch/lib/unaligned.S index 9177fd638f07..185f82d85810 100644 --- a/arch/loongarch/lib/unaligned.S +++ b/arch/loongarch/lib/unaligned.S @@ -9,7 +9,6 @@ #include <asm/asmmacro.h> #include <asm/asm-extable.h> #include <asm/errno.h> -#include <asm/export.h> #include <asm/regdef.h> .L_fixup_handle_unaligned: diff --git a/arch/loongarch/mm/tlbex.S b/arch/loongarch/mm/tlbex.S index 4ad78703de6f..ca17dd3a1915 100644 --- a/arch/loongarch/mm/tlbex.S +++ b/arch/loongarch/mm/tlbex.S @@ -3,7 +3,6 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ #include <asm/asm.h> -#include <asm/export.h> #include <asm/loongarch.h> #include <asm/page.h> #include <asm/pgtable.h> -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] loongarch: replace #include <asm/export.h> with #include <linux/export.h> 2023-08-07 15:42 [PATCH 1/3] loongarch: remove unneeded #include <asm/export.h> Masahiro Yamada @ 2023-08-07 15:42 ` Masahiro Yamada 2023-08-07 15:42 ` [PATCH 3/3] loongarch: remove <asm/export.h> Masahiro Yamada 1 sibling, 0 replies; 5+ messages in thread From: Masahiro Yamada @ 2023-08-07 15:42 UTC (permalink / raw) To: Huacai Chen, WANG Xuerui, loongarch Cc: linux-kernel, linux-arch, Masahiro Yamada Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>. Replace #include <asm/export.h> with #include <linux/export.h>. After all the <asm/export.h> lines are converted, <asm/export.h> and <asm-generic/export.h> will be removed. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/loongarch/kernel/fpu.S | 2 +- arch/loongarch/kernel/mcount.S | 2 +- arch/loongarch/lib/clear_user.S | 2 +- arch/loongarch/lib/copy_user.S | 2 +- arch/loongarch/lib/memcpy.S | 2 +- arch/loongarch/lib/memmove.S | 2 +- arch/loongarch/lib/memset.S | 2 +- arch/loongarch/mm/page.S | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/loongarch/kernel/fpu.S b/arch/loongarch/kernel/fpu.S index 59f1572aa523..b4032deb8e3b 100644 --- a/arch/loongarch/kernel/fpu.S +++ b/arch/loongarch/kernel/fpu.S @@ -6,12 +6,12 @@ * * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/asm-extable.h> #include <asm/asm-offsets.h> #include <asm/errno.h> -#include <asm/export.h> #include <asm/fpregdef.h> #include <asm/loongarch.h> #include <asm/regdef.h> diff --git a/arch/loongarch/kernel/mcount.S b/arch/loongarch/kernel/mcount.S index cb8e5803de4b..3015896016a0 100644 --- a/arch/loongarch/kernel/mcount.S +++ b/arch/loongarch/kernel/mcount.S @@ -5,7 +5,7 @@ * Copyright (C) 2022 Loongson Technology Corporation Limited */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/ftrace.h> #include <asm/regdef.h> #include <asm/stackframe.h> diff --git a/arch/loongarch/lib/clear_user.S b/arch/loongarch/lib/clear_user.S index 9dcf71719387..0790eadce166 100644 --- a/arch/loongarch/lib/clear_user.S +++ b/arch/loongarch/lib/clear_user.S @@ -3,12 +3,12 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/alternative-asm.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/asm-extable.h> #include <asm/cpu.h> -#include <asm/export.h> #include <asm/regdef.h> .irp to, 0, 1, 2, 3, 4, 5, 6, 7 diff --git a/arch/loongarch/lib/copy_user.S b/arch/loongarch/lib/copy_user.S index fecd08cad702..bfe3d2793d00 100644 --- a/arch/loongarch/lib/copy_user.S +++ b/arch/loongarch/lib/copy_user.S @@ -3,12 +3,12 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/alternative-asm.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/asm-extable.h> #include <asm/cpu.h> -#include <asm/export.h> #include <asm/regdef.h> .irp to, 0, 1, 2, 3, 4, 5, 6, 7 diff --git a/arch/loongarch/lib/memcpy.S b/arch/loongarch/lib/memcpy.S index f5d4c3e65264..fa1148878d2b 100644 --- a/arch/loongarch/lib/memcpy.S +++ b/arch/loongarch/lib/memcpy.S @@ -3,11 +3,11 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/alternative-asm.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/cpu.h> -#include <asm/export.h> #include <asm/regdef.h> .section .noinstr.text, "ax" diff --git a/arch/loongarch/lib/memmove.S b/arch/loongarch/lib/memmove.S index 71b81d271c73..82dae062fec8 100644 --- a/arch/loongarch/lib/memmove.S +++ b/arch/loongarch/lib/memmove.S @@ -3,11 +3,11 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/alternative-asm.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/cpu.h> -#include <asm/export.h> #include <asm/regdef.h> .section .noinstr.text, "ax" diff --git a/arch/loongarch/lib/memset.S b/arch/loongarch/lib/memset.S index a45f6f92ee3b..06d3ca54cbfe 100644 --- a/arch/loongarch/lib/memset.S +++ b/arch/loongarch/lib/memset.S @@ -3,11 +3,11 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <asm/alternative-asm.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/cpu.h> -#include <asm/export.h> #include <asm/regdef.h> .macro fill_to_64 r0 diff --git a/arch/loongarch/mm/page.S b/arch/loongarch/mm/page.S index 4c874a7af0ad..7ad76551d313 100644 --- a/arch/loongarch/mm/page.S +++ b/arch/loongarch/mm/page.S @@ -2,9 +2,9 @@ /* * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asm.h> -#include <asm/export.h> #include <asm/page.h> #include <asm/regdef.h> -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] loongarch: remove <asm/export.h> 2023-08-07 15:42 [PATCH 1/3] loongarch: remove unneeded #include <asm/export.h> Masahiro Yamada 2023-08-07 15:42 ` [PATCH 2/3] loongarch: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada @ 2023-08-07 15:42 ` Masahiro Yamada 2023-08-07 15:56 ` Huacai Chen 1 sibling, 1 reply; 5+ messages in thread From: Masahiro Yamada @ 2023-08-07 15:42 UTC (permalink / raw) To: Huacai Chen, WANG Xuerui, loongarch Cc: linux-kernel, linux-arch, Masahiro Yamada All *.S files under arch/loongarch/ have been converted to include <linux/export.h> instead of <asm/export.h>. Remove <asm/export.h>. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/loongarch/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/loongarch/include/asm/Kbuild b/arch/loongarch/include/asm/Kbuild index 6b222f227342..93783fa24f6e 100644 --- a/arch/loongarch/include/asm/Kbuild +++ b/arch/loongarch/include/asm/Kbuild @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 generic-y += dma-contiguous.h -generic-y += export.h generic-y += mcs_spinlock.h generic-y += parport.h generic-y += early_ioremap.h -- 2.39.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] loongarch: remove <asm/export.h> 2023-08-07 15:42 ` [PATCH 3/3] loongarch: remove <asm/export.h> Masahiro Yamada @ 2023-08-07 15:56 ` Huacai Chen 2023-08-07 16:18 ` Masahiro Yamada 0 siblings, 1 reply; 5+ messages in thread From: Huacai Chen @ 2023-08-07 15:56 UTC (permalink / raw) To: Masahiro Yamada; +Cc: WANG Xuerui, loongarch, linux-kernel, linux-arch Hi, Masahiro, Is this series only for linux-next (6.6), or also needed by 6.5? Huacai On Mon, Aug 7, 2023 at 11:43 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > All *.S files under arch/loongarch/ have been converted to include > <linux/export.h> instead of <asm/export.h>. > > Remove <asm/export.h>. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/loongarch/include/asm/Kbuild | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/loongarch/include/asm/Kbuild b/arch/loongarch/include/asm/Kbuild > index 6b222f227342..93783fa24f6e 100644 > --- a/arch/loongarch/include/asm/Kbuild > +++ b/arch/loongarch/include/asm/Kbuild > @@ -1,6 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > generic-y += dma-contiguous.h > -generic-y += export.h > generic-y += mcs_spinlock.h > generic-y += parport.h > generic-y += early_ioremap.h > -- > 2.39.2 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] loongarch: remove <asm/export.h> 2023-08-07 15:56 ` Huacai Chen @ 2023-08-07 16:18 ` Masahiro Yamada 0 siblings, 0 replies; 5+ messages in thread From: Masahiro Yamada @ 2023-08-07 16:18 UTC (permalink / raw) To: Huacai Chen; +Cc: WANG Xuerui, loongarch, linux-kernel, linux-arch On Tue, Aug 8, 2023 at 12:56 AM Huacai Chen <chenhuacai@kernel.org> wrote: > > Hi, Masahiro, > > Is this series only for linux-next (6.6), or also needed by 6.5? I meant it for linux-next (6.6). Code clean-up can wait for the next MW. -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-07 16:19 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-08-07 15:42 [PATCH 1/3] loongarch: remove unneeded #include <asm/export.h> Masahiro Yamada 2023-08-07 15:42 ` [PATCH 2/3] loongarch: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada 2023-08-07 15:42 ` [PATCH 3/3] loongarch: remove <asm/export.h> Masahiro Yamada 2023-08-07 15:56 ` Huacai Chen 2023-08-07 16:18 ` Masahiro Yamada
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox