Skip to contentSkip to conversation

mips: remove unneeded #include <asm/export.h>

PATCH Applied Masahiro Yamada 3 participants 9 messages Aug 7, 2023 – Aug 15, 2023

Subsystems (2)
MIPS Generic include/asm header files
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/3 mips: remove unneeded #include <asm/export.h>

There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> is unneeded.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/mips/kernel/octeon_switch.S | 1 -
 arch/mips/kernel/r2300_switch.S  | 1 -
 2 files changed, 2 deletions(-)
arch/mips/kernel/octeon_switch.S +0 -1
index 9b7c8ab6f08c..447a3ea14aa1 100644
@@ -11,7 +11,6 @@
  *    written by Carsten Langgaard, [email protected]
  */
 #include <asm/asm.h>
-#include <asm/export.h>
 #include <asm/asm-offsets.h>
 #include <asm/mipsregs.h>
 #include <asm/regdef.h>
arch/mips/kernel/r2300_switch.S +0 -1
index 71b1aafae1bb..48e63943e6f7 100644
@@ -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>
Signature · 1 line
2.39.2
author
#1 lore raw

PATCH 2/3 mips: replace #include <asm/export.h> with #include <linux/export.h>

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 <[email protected]>

---

 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(-)
arch/mips/cavium-octeon/octeon-memcpy.S +1 -1
index 25860fba6218..fef0c6de3fa1 100644
@@ -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
arch/mips/kernel/mcount.S +1 -1
index cff52b283e03..fcec579f64e9 100644
@@ -10,7 +10,7 @@
  * Author: Wu Zhangjin <[email protected]>
  */
 
-#include <asm/export.h>
+#include <linux/export.h>
 #include <asm/regdef.h>
 #include <asm/stackframe.h>
 #include <asm/ftrace.h>
arch/mips/kernel/r2300_fpu.S +1 -1
index 6c745aa9e825..c000b22e3fcd 100644
@@ -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>
arch/mips/kernel/r4k_fpu.S +1 -1
index 4e8c98517d9d..4bb97ee89904 100644
@@ -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>
arch/mips/lib/csum_partial.S +1 -1
index 7767137c3e49..3d2ff4118d79 100644
@@ -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
arch/mips/lib/memcpy.S +1 -1
index 18a43f2e29c8..a4b4e805ff13 100644
@@ -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
arch/mips/lib/memset.S +1 -1
index 0b342bae9a98..79405c32cc85 100644
@@ -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
arch/mips/lib/strncpy_user.S +1 -1
index 13aaa9927ad1..94f4203563c1 100644
@@ -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)			\
arch/mips/lib/strnlen_user.S +1 -1
index 6de31b616f9c..c192a6f6cd84 100644
@@ -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)			\
arch/mips/mm/page-funcs.S +1 -1
index 43181ac0a1af..42d0516ca18a 100644
@@ -8,8 +8,8 @@
  * Copyright (C) 2012  MIPS Technologies, Inc.
  * Copyright (C) 2012  Ralf Baechle <[email protected]>
  */
+#include <linux/export.h>
 #include <asm/asm.h>
-#include <asm/export.h>
 #include <asm/regdef.h>
 
 #ifdef CONFIG_SIBYTE_DMA_PAGEOPS
arch/mips/mm/tlb-funcs.S +1 -1
index 00fef578c8cd..2705d7dcb33e 100644
@@ -11,8 +11,8 @@
  * Copyright (C) 2012  MIPS Technologies, Inc.
  * Copyright (C) 2012  Ralf Baechle <[email protected]>
  */
+#include <linux/export.h>
 #include <asm/asm.h>
-#include <asm/export.h>
 #include <asm/regdef.h>
 
 #define FASTPATH_SIZE	128
Signature · 1 line
2.39.2
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h>

Quoted 11 lines · 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 <[email protected]>

---

Quoted 12 lines
  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é <[email protected]>
maintainer Applied
#3 lore raw

Re: [PATCH 2/3] mips: replace #include <asm/export.h> with #include <linux/export.h>

In reply to Masahiro Yamada
Quoted 11 lines · 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 <[email protected]>

---

Quoted 12 lines
 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.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
author
#4 lore raw

PATCH 3/3 mips: remove <asm/export.h>

In reply to 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 <[email protected]>

---

 arch/mips/include/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/mips/include/asm/Kbuild +0 -1
index dee172716581..7ba67a0d6c97 100644
@@ -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
Signature · 1 line
2.39.2
maintainer Applied
#6 lore raw

Re: [PATCH 3/3] mips: remove <asm/export.h>

In reply to Masahiro Yamada
Quoted 26 lines · 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 <[email protected]>

---

 arch/mips/include/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/mips/include/asm/Kbuild +0 -1
index dee172716581..7ba67a0d6c97 100644
@@ -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
Signature · 1 line
2.39.2

applied to mips-next.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]
maintainer Applied
#8 lore raw
In reply to Masahiro Yamada
Quoted 36 lines · Masahiro Yamada

There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> is unneeded.

Signed-off-by Masahiro Yamada <[email protected]>

---

 arch/mips/kernel/octeon_switch.S | 1 -
 arch/mips/kernel/r2300_switch.S  | 1 -
 2 files changed, 2 deletions(-)
arch/mips/kernel/octeon_switch.S +0 -1
index 9b7c8ab6f08c..447a3ea14aa1 100644
@@ -11,7 +11,6 @@
  *    written by Carsten Langgaard, [email protected]
  */
 #include <asm/asm.h>
-#include <asm/export.h>
 #include <asm/asm-offsets.h>
 #include <asm/mipsregs.h>
 #include <asm/regdef.h>
arch/mips/kernel/r2300_switch.S +0 -1
index 71b1aafae1bb..48e63943e6f7 100644
@@ -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>
Signature · 1 line
2.39.2

applied to mips-next.

Thomas.

Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]