sparc: 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 <masahiroy@kernel.org> Acked-by: Sam Ravnborg <sam@ravnborg.org>
2023-08-20 08:33:48 +09:00 · 2023-08-20 08:33:48 +09:00 · 4cdb71b6ba
commit 4cdb71b6ba
parent 1fdd729019
39 changed files with 40 additions and 39 deletions
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@ -8,6 +8,7 @@
 * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <linux/pgtable.h>
@ -30,7 +31,6 @@
 #include <asm/unistd.h>

 #include <asm/asmmacro.h>
-#include <asm/export.h>

 #define curptr      g6

--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@ -11,6 +11,7 @@
 * CompactPCI platform by Eric Brower, 1999.
 */

+#include <linux/export.h>
 #include <linux/version.h>
 #include <linux/init.h>

@ -25,7 +26,6 @@
 #include <asm/thread_info.h>	/* TI_UWINMASK */
 #include <asm/errno.h>
 #include <asm/pgtable.h>	/* PGDIR_SHIFT */
-#include <asm/export.h>

 	.data
 /* The following are used with the prom_vector node-ops to figure out
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@ -9,6 +9,7 @@

 #include <linux/version.h>
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/threads.h>
 #include <linux/init.h>
 #include <linux/linkage.h>
@ -33,7 +34,6 @@
 #include <asm/estate.h>
 #include <asm/sfafsr.h>
 #include <asm/unistd.h>
-#include <asm/export.h>

 /* This section from from _start to sparc64_boot_end should fit into
 * 0x0000000000404000 to 0x0000000000408000.
--- a/arch/sparc/lib/U1memcpy.S
+++ b/arch/sparc/lib/U1memcpy.S
@ -6,10 +6,10 @@
 */

 #ifdef __KERNEL__
+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 #include <asm/asi.h>
-#include <asm/export.h>
 #define GLOBAL_SPARE	g7
 #else
 #define GLOBAL_SPARE	g5
--- a/arch/sparc/lib/VISsave.S
+++ b/arch/sparc/lib/VISsave.S
@ -7,6 +7,7 @@
 * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>

 #include <asm/asi.h>
@ -14,7 +15,6 @@
 #include <asm/ptrace.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
-#include <asm/export.h>

 	/* On entry: %o5=current FPRS value, %g7 is callers address */
 	/* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */
--- a/arch/sparc/lib/ashldi3.S
+++ b/arch/sparc/lib/ashldi3.S
@ -6,8 +6,8 @@
 * Copyright (C) 1999 David S. Miller (davem@redhat.com)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 ENTRY(__ashldi3)
--- a/arch/sparc/lib/ashrdi3.S
+++ b/arch/sparc/lib/ashrdi3.S
@ -6,8 +6,8 @@
 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 ENTRY(__ashrdi3)
--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
@ -4,10 +4,10 @@
 * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
 #include <asm/backoff.h>
-#include <asm/export.h>

 	.text

--- a/arch/sparc/lib/bitops.S
+++ b/arch/sparc/lib/bitops.S
@ -4,10 +4,10 @@
 * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
 #include <asm/backoff.h>
-#include <asm/export.h>

 	.text

--- a/arch/sparc/lib/blockops.S
+++ b/arch/sparc/lib/blockops.S
@ -5,9 +5,9 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/page.h>
-#include <asm/export.h>

 	/* Zero out 64 bytes of memory at (buf + offset).
 	 * Assumes %g1 contains zero.
--- a/arch/sparc/lib/bzero.S
+++ b/arch/sparc/lib/bzero.S
@ -5,8 +5,8 @@
 * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text

--- a/arch/sparc/lib/checksum_32.S
+++ b/arch/sparc/lib/checksum_32.S
@ -14,8 +14,8 @@
 *	BSD4.4 portable checksum routine
 */

+#include <linux/export.h>
 #include <asm/errno.h>
-#include <asm/export.h>

 #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5)	\
 	ldd	[buf + offset + 0x00], t0;			\
--- a/arch/sparc/lib/checksum_64.S
+++ b/arch/sparc/lib/checksum_64.S
@ -14,7 +14,7 @@
 *	BSD4.4 portable checksum routine
 */

-#include <asm/export.h>
+#include <linux/export.h>
 	.text

 csum_partial_fix_alignment:
--- a/arch/sparc/lib/clear_page.S
+++ b/arch/sparc/lib/clear_page.S
@ -5,13 +5,13 @@
 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
 */

+#include <linux/export.h>
 #include <linux/pgtable.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm/spitfire.h>
 #include <asm/head.h>
-#include <asm/export.h>

 	/* What we used to do was lock a TLB entry into a specific
 	 * TLB slot, clear the page with interrupts disabled, then
--- a/arch/sparc/lib/copy_in_user.S
+++ b/arch/sparc/lib/copy_in_user.S
@ -4,9 +4,9 @@
 * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
-#include <asm/export.h>

 #define XCC xcc

--- a/arch/sparc/lib/copy_page.S
+++ b/arch/sparc/lib/copy_page.S
@ -5,13 +5,13 @@
 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
 */

+#include <linux/export.h>
 #include <asm/visasm.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 #include <linux/pgtable.h>
 #include <asm/spitfire.h>
 #include <asm/head.h>
-#include <asm/export.h>

 	/* What we used to do was lock a TLB entry into a specific
 	 * TLB slot, clear the page with interrupts disabled, then
--- a/arch/sparc/lib/copy_user.S
+++ b/arch/sparc/lib/copy_user.S
@ -12,11 +12,11 @@
 * Returns 0 if successful, otherwise count of bytes not copied yet
 */

+#include <linux/export.h>
 #include <asm/ptrace.h>
 #include <asm/asmmacro.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
-#include <asm/export.h>

 /* Work around cpp -rob */
 #define ALLOC #alloc
--- a/arch/sparc/lib/csum_copy.S
+++ b/arch/sparc/lib/csum_copy.S
@ -4,7 +4,7 @@
 * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
 */

-#include <asm/export.h>
+#include <linux/export.h>

 #ifdef __KERNEL__
 #define GLOBAL_SPARE	%g7
--- a/arch/sparc/lib/divdi3.S
+++ b/arch/sparc/lib/divdi3.S
@ -5,7 +5,7 @@ This file is part of GNU CC.

 */

-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.globl __divdi3
--- a/arch/sparc/lib/ffs.S
+++ b/arch/sparc/lib/ffs.S
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.register	%g2,#scratch

--- a/arch/sparc/lib/fls.S
+++ b/arch/sparc/lib/fls.S
@ -5,8 +5,8 @@
 * and onward.
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 	.register	%g2, #scratch
--- a/arch/sparc/lib/fls64.S
+++ b/arch/sparc/lib/fls64.S
@ -5,8 +5,8 @@
 * and onward.
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 	.register	%g2, #scratch
--- a/arch/sparc/lib/hweight.S
+++ b/arch/sparc/lib/hweight.S
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 	.align	32
--- a/arch/sparc/lib/ipcsum.S
+++ b/arch/sparc/lib/ipcsum.S
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */
--- a/arch/sparc/lib/locks.S
+++ b/arch/sparc/lib/locks.S
@ -7,11 +7,11 @@
 * Copyright (C) 1998 Jakub Jelinek   (jj@ultra.linux.cz)
 */

+#include <linux/export.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
 #include <asm/smp.h>
 #include <asm/spinlock.h>
-#include <asm/export.h>

 	.text
 	.align	4
--- a/arch/sparc/lib/lshrdi3.S
+++ b/arch/sparc/lib/lshrdi3.S
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 ENTRY(__lshrdi3)
 	cmp	%o2, 0
--- a/arch/sparc/lib/mcount.S
+++ b/arch/sparc/lib/mcount.S
@ -6,8 +6,8 @@
 * This can also be tweaked for kernel stack overflow detection.
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 /*
 * This is the main variant and is called by C code.  GCC's -pg option
--- a/arch/sparc/lib/memcmp.S
+++ b/arch/sparc/lib/memcmp.S
@ -5,9 +5,9 @@
 * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asm.h>
-#include <asm/export.h>

 	.text
 ENTRY(memcmp)
--- a/arch/sparc/lib/memcpy.S
+++ b/arch/sparc/lib/memcpy.S
@ -8,7 +8,8 @@
 * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 */

-#include <asm/export.h>
+#include <linux/export.h>
+
 #define FUNC(x) 		\
 	.globl	x;		\
 	.type	x,@function;	\
--- a/arch/sparc/lib/memmove.S
+++ b/arch/sparc/lib/memmove.S
@ -5,8 +5,8 @@
 * Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 ENTRY(memmove) /* o0=dst o1=src o2=len */
--- a/arch/sparc/lib/memscan_32.S
+++ b/arch/sparc/lib/memscan_32.S
@ -5,7 +5,7 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <asm/export.h>
+#include <linux/export.h>

 /* In essence, this is just a fancy strlen. */

--- a/arch/sparc/lib/memscan_64.S
+++ b/arch/sparc/lib/memscan_64.S
@ -6,7 +6,7 @@
 * Copyright (C) 1998 David S. Miller (davem@redhat.com)
 */

-	#include <asm/export.h>
+#include <linux/export.h>

 #define HI_MAGIC	0x8080808080808080
 #define LO_MAGIC	0x0101010101010101
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
@ -9,8 +9,8 @@
 * clear_user.
 */

+#include <linux/export.h>
 #include <asm/ptrace.h>
-#include <asm/export.h>

 /* Work around cpp -rob */
 #define ALLOC #alloc
--- a/arch/sparc/lib/muldi3.S
+++ b/arch/sparc/lib/muldi3.S
@ -5,7 +5,7 @@ This file is part of GNU CC.

 */

-#include <asm/export.h>
+#include <linux/export.h>
 	.text
 	.align 4
 	.globl __muldi3
--- a/arch/sparc/lib/multi3.S
+++ b/arch/sparc/lib/multi3.S
@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 	.align	4
--- a/arch/sparc/lib/strlen.S
+++ b/arch/sparc/lib/strlen.S
@ -6,9 +6,9 @@
 * Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asm.h>
-#include <asm/export.h>

 #define LO_MAGIC 0x01010101
 #define HI_MAGIC 0x80808080
--- a/arch/sparc/lib/strncmp_32.S
+++ b/arch/sparc/lib/strncmp_32.S
@ -4,8 +4,8 @@
 *            generic strncmp routine.
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
-#include <asm/export.h>

 	.text
 ENTRY(strncmp)
--- a/arch/sparc/lib/strncmp_64.S
+++ b/arch/sparc/lib/strncmp_64.S
@ -5,9 +5,9 @@
 * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/asi.h>
-#include <asm/export.h>

 	.text
 ENTRY(strncmp)
--- a/arch/sparc/lib/xor.S
+++ b/arch/sparc/lib/xor.S
@ -9,12 +9,12 @@
 * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
 */

+#include <linux/export.h>
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 #include <asm/asi.h>
 #include <asm/dcu.h>
 #include <asm/spitfire.h>
-#include <asm/export.h>

 /*
 *	Requirements: