* [PATCH 1/3] mips: remove unneeded #include <asm/export.h>
@ 2023-08-07 15:32 Masahiro Yamada
2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Masahiro Yamada @ 2023-08-07 15:32 UTC (permalink / raw)
To: Thomas Bogendoerfer, linux-mips; +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/mips/kernel/octeon_switch.S | 1 -
arch/mips/kernel/r2300_switch.S | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S
index 9b7c8ab6f08c..447a3ea14aa1 100644
--- a/arch/mips/kernel/octeon_switch.S
+++ b/arch/mips/kernel/octeon_switch.S
@@ -11,7 +11,6 @@
* written by Carsten Langgaard, carstenl@mips.com
*/
#include <asm/asm.h>
-#include <asm/export.h>
#include <asm/asm-offsets.h>
#include <asm/mipsregs.h>
#include <asm/regdef.h>
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index 71b1aafae1bb..48e63943e6f7 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -13,7 +13,6 @@
*/
#include <asm/asm.h>
#include <asm/cachectl.h>
-#include <asm/export.h>
#include <asm/fpregdef.h>
#include <asm/mipsregs.h>
#include <asm/asm-offsets.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> 2023-08-07 15:32 [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Masahiro Yamada @ 2023-08-07 15:32 ` Masahiro Yamada 2023-08-08 9:38 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 2023-08-07 15:32 ` [PATCH 3/3] mips: remove <asm/export.h> Masahiro Yamada ` (2 subsequent siblings) 3 siblings, 2 replies; 9+ messages in thread From: Masahiro Yamada @ 2023-08-07 15:32 UTC (permalink / raw) To: Thomas Bogendoerfer, linux-mips; +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/mips/cavium-octeon/octeon-memcpy.S | 2 +- arch/mips/kernel/mcount.S | 2 +- arch/mips/kernel/r2300_fpu.S | 2 +- arch/mips/kernel/r4k_fpu.S | 2 +- arch/mips/lib/csum_partial.S | 2 +- arch/mips/lib/memcpy.S | 2 +- arch/mips/lib/memset.S | 2 +- arch/mips/lib/strncpy_user.S | 2 +- arch/mips/lib/strnlen_user.S | 2 +- arch/mips/mm/page-funcs.S | 2 +- arch/mips/mm/tlb-funcs.S | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/mips/cavium-octeon/octeon-memcpy.S b/arch/mips/cavium-octeon/octeon-memcpy.S index 25860fba6218..fef0c6de3fa1 100644 --- a/arch/mips/cavium-octeon/octeon-memcpy.S +++ b/arch/mips/cavium-octeon/octeon-memcpy.S @@ -13,9 +13,9 @@ * Mnemonic names for arguments to memcpy/__copy_user */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #define dst a0 diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S index cff52b283e03..fcec579f64e9 100644 --- a/arch/mips/kernel/mcount.S +++ b/arch/mips/kernel/mcount.S @@ -10,7 +10,7 @@ * Author: Wu Zhangjin <wuzhangjin@gmail.com> */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/regdef.h> #include <asm/stackframe.h> #include <asm/ftrace.h> diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S index 6c745aa9e825..c000b22e3fcd 100644 --- a/arch/mips/kernel/r2300_fpu.S +++ b/arch/mips/kernel/r2300_fpu.S @@ -11,10 +11,10 @@ * Further modifications to make this work: * Copyright (c) 1998 Harald Koerfgen */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/errno.h> -#include <asm/export.h> #include <asm/fpregdef.h> #include <asm/mipsregs.h> #include <asm/asm-offsets.h> diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index 4e8c98517d9d..4bb97ee89904 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S @@ -12,10 +12,10 @@ * Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 1999, 2001 Silicon Graphics, Inc. */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asmmacro.h> #include <asm/errno.h> -#include <asm/export.h> #include <asm/fpregdef.h> #include <asm/mipsregs.h> #include <asm/asm-offsets.h> diff --git a/arch/mips/lib/csum_partial.S b/arch/mips/lib/csum_partial.S index 7767137c3e49..3d2ff4118d79 100644 --- a/arch/mips/lib/csum_partial.S +++ b/arch/mips/lib/csum_partial.S @@ -11,9 +11,9 @@ * Copyright (C) 2014 Imagination Technologies Ltd. */ #include <linux/errno.h> +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #ifdef CONFIG_64BIT diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 18a43f2e29c8..a4b4e805ff13 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S @@ -32,9 +32,9 @@ #undef CONFIG_CPU_HAS_PREFETCH #endif +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #define dst a0 diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index 0b342bae9a98..79405c32cc85 100644 --- a/arch/mips/lib/memset.S +++ b/arch/mips/lib/memset.S @@ -8,9 +8,9 @@ * Copyright (C) 2007 by Maciej W. Rozycki * Copyright (C) 2011, 2012 MIPS Technologies, Inc. */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #if LONGSIZE == 4 diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S index 13aaa9927ad1..94f4203563c1 100644 --- a/arch/mips/lib/strncpy_user.S +++ b/arch/mips/lib/strncpy_user.S @@ -7,9 +7,9 @@ * Copyright (C) 2011 MIPS Technologies, Inc. */ #include <linux/errno.h> +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #define EX(insn,reg,addr,handler) \ diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S index 6de31b616f9c..c192a6f6cd84 100644 --- a/arch/mips/lib/strnlen_user.S +++ b/arch/mips/lib/strnlen_user.S @@ -6,9 +6,9 @@ * Copyright (c) 1996, 1998, 1999, 2004 by Ralf Baechle * Copyright (c) 1999 Silicon Graphics, Inc. */ +#include <linux/export.h> #include <asm/asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/regdef.h> #define EX(insn,reg,addr,handler) \ diff --git a/arch/mips/mm/page-funcs.S b/arch/mips/mm/page-funcs.S index 43181ac0a1af..42d0516ca18a 100644 --- a/arch/mips/mm/page-funcs.S +++ b/arch/mips/mm/page-funcs.S @@ -8,8 +8,8 @@ * Copyright (C) 2012 MIPS Technologies, Inc. * Copyright (C) 2012 Ralf Baechle <ralf@linux-mips.org> */ +#include <linux/export.h> #include <asm/asm.h> -#include <asm/export.h> #include <asm/regdef.h> #ifdef CONFIG_SIBYTE_DMA_PAGEOPS diff --git a/arch/mips/mm/tlb-funcs.S b/arch/mips/mm/tlb-funcs.S index 00fef578c8cd..2705d7dcb33e 100644 --- a/arch/mips/mm/tlb-funcs.S +++ b/arch/mips/mm/tlb-funcs.S @@ -11,8 +11,8 @@ * Copyright (C) 2012 MIPS Technologies, Inc. * Copyright (C) 2012 Ralf Baechle <ralf@linux-mips.org> */ +#include <linux/export.h> #include <asm/asm.h> -#include <asm/export.h> #include <asm/regdef.h> #define FASTPATH_SIZE 128 -- 2.39.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> 2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada @ 2023-08-08 9:38 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 1 sibling, 0 replies; 9+ messages in thread From: Philippe Mathieu-Daudé @ 2023-08-08 9:38 UTC (permalink / raw) To: Masahiro Yamada, Thomas Bogendoerfer, linux-mips; +Cc: linux-kernel, linux-arch On 7/8/23 17:32, Masahiro Yamada wrote: > 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/mips/cavium-octeon/octeon-memcpy.S | 2 +- > arch/mips/kernel/mcount.S | 2 +- > arch/mips/kernel/r2300_fpu.S | 2 +- > arch/mips/kernel/r4k_fpu.S | 2 +- > arch/mips/lib/csum_partial.S | 2 +- > arch/mips/lib/memcpy.S | 2 +- > arch/mips/lib/memset.S | 2 +- > arch/mips/lib/strncpy_user.S | 2 +- > arch/mips/lib/strnlen_user.S | 2 +- > arch/mips/mm/page-funcs.S | 2 +- > arch/mips/mm/tlb-funcs.S | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> 2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada 2023-08-08 9:38 ` Philippe Mathieu-Daudé @ 2023-08-15 8:27 ` Thomas Bogendoerfer 1 sibling, 0 replies; 9+ messages in thread From: Thomas Bogendoerfer @ 2023-08-15 8:27 UTC (permalink / raw) To: Masahiro Yamada; +Cc: linux-mips, linux-kernel, linux-arch On Tue, Aug 08, 2023 at 12:32:42AM +0900, Masahiro Yamada wrote: > 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/mips/cavium-octeon/octeon-memcpy.S | 2 +- > arch/mips/kernel/mcount.S | 2 +- > arch/mips/kernel/r2300_fpu.S | 2 +- > arch/mips/kernel/r4k_fpu.S | 2 +- > arch/mips/lib/csum_partial.S | 2 +- > arch/mips/lib/memcpy.S | 2 +- > arch/mips/lib/memset.S | 2 +- > arch/mips/lib/strncpy_user.S | 2 +- > arch/mips/lib/strnlen_user.S | 2 +- > arch/mips/mm/page-funcs.S | 2 +- > arch/mips/mm/tlb-funcs.S | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) applied to mips-next. 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] 9+ messages in thread
* [PATCH 3/3] mips: remove <asm/export.h> 2023-08-07 15:32 [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Masahiro Yamada 2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada @ 2023-08-07 15:32 ` Masahiro Yamada 2023-08-08 9:39 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 2023-08-08 9:37 ` [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Philippe Mathieu-Daudé 2023-08-15 8:26 ` Thomas Bogendoerfer 3 siblings, 2 replies; 9+ messages in thread From: Masahiro Yamada @ 2023-08-07 15:32 UTC (permalink / raw) To: Thomas Bogendoerfer, linux-mips; +Cc: linux-kernel, linux-arch, Masahiro Yamada All *.S files under arch/mips/ 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/mips/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild index dee172716581..7ba67a0d6c97 100644 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@ -7,7 +7,6 @@ generated-y += unistd_nr_n32.h generated-y += unistd_nr_n64.h generated-y += unistd_nr_o32.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h -- 2.39.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] mips: remove <asm/export.h> 2023-08-07 15:32 ` [PATCH 3/3] mips: remove <asm/export.h> Masahiro Yamada @ 2023-08-08 9:39 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 1 sibling, 0 replies; 9+ messages in thread From: Philippe Mathieu-Daudé @ 2023-08-08 9:39 UTC (permalink / raw) To: Masahiro Yamada, Thomas Bogendoerfer, linux-mips; +Cc: linux-kernel, linux-arch On 7/8/23 17:32, Masahiro Yamada wrote: > All *.S files under arch/mips/ 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/mips/include/asm/Kbuild | 1 - > 1 file changed, 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] mips: remove <asm/export.h> 2023-08-07 15:32 ` [PATCH 3/3] mips: remove <asm/export.h> Masahiro Yamada 2023-08-08 9:39 ` Philippe Mathieu-Daudé @ 2023-08-15 8:27 ` Thomas Bogendoerfer 1 sibling, 0 replies; 9+ messages in thread From: Thomas Bogendoerfer @ 2023-08-15 8:27 UTC (permalink / raw) To: Masahiro Yamada; +Cc: linux-mips, linux-kernel, linux-arch On Tue, Aug 08, 2023 at 12:32:43AM +0900, Masahiro Yamada wrote: > All *.S files under arch/mips/ 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/mips/include/asm/Kbuild | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild > index dee172716581..7ba67a0d6c97 100644 > --- a/arch/mips/include/asm/Kbuild > +++ b/arch/mips/include/asm/Kbuild > @@ -7,7 +7,6 @@ generated-y += unistd_nr_n32.h > generated-y += unistd_nr_n64.h > generated-y += unistd_nr_o32.h > > -generic-y += export.h > generic-y += kvm_para.h > generic-y += mcs_spinlock.h > generic-y += parport.h > -- > 2.39.2 > applied to mips-next. 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] 9+ messages in thread
* Re: [PATCH 1/3] mips: remove unneeded #include <asm/export.h> 2023-08-07 15:32 [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Masahiro Yamada 2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada 2023-08-07 15:32 ` [PATCH 3/3] mips: remove <asm/export.h> Masahiro Yamada @ 2023-08-08 9:37 ` Philippe Mathieu-Daudé 2023-08-15 8:26 ` Thomas Bogendoerfer 3 siblings, 0 replies; 9+ messages in thread From: Philippe Mathieu-Daudé @ 2023-08-08 9:37 UTC (permalink / raw) To: Masahiro Yamada, Thomas Bogendoerfer, linux-mips; +Cc: linux-kernel, linux-arch On 7/8/23 17:32, Masahiro Yamada wrote: > There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> > is unneeded. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/mips/kernel/octeon_switch.S | 1 - > arch/mips/kernel/r2300_switch.S | 1 - > 2 files changed, 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] mips: remove unneeded #include <asm/export.h> 2023-08-07 15:32 [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Masahiro Yamada ` (2 preceding siblings ...) 2023-08-08 9:37 ` [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Philippe Mathieu-Daudé @ 2023-08-15 8:26 ` Thomas Bogendoerfer 3 siblings, 0 replies; 9+ messages in thread From: Thomas Bogendoerfer @ 2023-08-15 8:26 UTC (permalink / raw) To: Masahiro Yamada; +Cc: linux-mips, linux-kernel, linux-arch On Tue, Aug 08, 2023 at 12:32:41AM +0900, Masahiro Yamada wrote: > There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> > is unneeded. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/mips/kernel/octeon_switch.S | 1 - > arch/mips/kernel/r2300_switch.S | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S > index 9b7c8ab6f08c..447a3ea14aa1 100644 > --- a/arch/mips/kernel/octeon_switch.S > +++ b/arch/mips/kernel/octeon_switch.S > @@ -11,7 +11,6 @@ > * written by Carsten Langgaard, carstenl@mips.com > */ > #include <asm/asm.h> > -#include <asm/export.h> > #include <asm/asm-offsets.h> > #include <asm/mipsregs.h> > #include <asm/regdef.h> > diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S > index 71b1aafae1bb..48e63943e6f7 100644 > --- a/arch/mips/kernel/r2300_switch.S > +++ b/arch/mips/kernel/r2300_switch.S > @@ -13,7 +13,6 @@ > */ > #include <asm/asm.h> > #include <asm/cachectl.h> > -#include <asm/export.h> > #include <asm/fpregdef.h> > #include <asm/mipsregs.h> > #include <asm/asm-offsets.h> > -- > 2.39.2 applied to mips-next. 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] 9+ messages in thread
end of thread, other threads:[~2023-08-15 9:11 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-08-07 15:32 [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Masahiro Yamada 2023-08-07 15:32 ` [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h> Masahiro Yamada 2023-08-08 9:38 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 2023-08-07 15:32 ` [PATCH 3/3] mips: remove <asm/export.h> Masahiro Yamada 2023-08-08 9:39 ` Philippe Mathieu-Daudé 2023-08-15 8:27 ` Thomas Bogendoerfer 2023-08-08 9:37 ` [PATCH 1/3] mips: remove unneeded #include <asm/export.h> Philippe Mathieu-Daudé 2023-08-15 8:26 ` 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).