sparc: replace #include <asm/export.h> with #include <linux/export.h>

Commit ddb5cdbafa ("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>
This commit is contained in:
Masahiro Yamada 2023-08-20 08:33:48 +09:00
parent 1fdd729019
commit 4cdb71b6ba
39 changed files with 40 additions and 39 deletions

View File

@ -8,6 +8,7 @@
* Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
@ -30,7 +31,6 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/export.h>
#define curptr g6 #define curptr g6

View File

@ -11,6 +11,7 @@
* CompactPCI platform by Eric Brower, 1999. * CompactPCI platform by Eric Brower, 1999.
*/ */
#include <linux/export.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/init.h> #include <linux/init.h>
@ -25,7 +26,6 @@
#include <asm/thread_info.h> /* TI_UWINMASK */ #include <asm/thread_info.h> /* TI_UWINMASK */
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/pgtable.h> /* PGDIR_SHIFT */ #include <asm/pgtable.h> /* PGDIR_SHIFT */
#include <asm/export.h>
.data .data
/* The following are used with the prom_vector node-ops to figure out /* The following are used with the prom_vector node-ops to figure out

View File

@ -9,6 +9,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/export.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/linkage.h> #include <linux/linkage.h>
@ -33,7 +34,6 @@
#include <asm/estate.h> #include <asm/estate.h>
#include <asm/sfafsr.h> #include <asm/sfafsr.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/export.h>
/* This section from from _start to sparc64_boot_end should fit into /* This section from from _start to sparc64_boot_end should fit into
* 0x0000000000404000 to 0x0000000000408000. * 0x0000000000404000 to 0x0000000000408000.

View File

@ -6,10 +6,10 @@
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/export.h>
#define GLOBAL_SPARE g7 #define GLOBAL_SPARE g7
#else #else
#define GLOBAL_SPARE g5 #define GLOBAL_SPARE g5

View File

@ -7,6 +7,7 @@
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asi.h> #include <asm/asi.h>
@ -14,7 +15,6 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/export.h>
/* On entry: %o5=current FPRS value, %g7 is callers address */ /* On entry: %o5=current FPRS value, %g7 is callers address */
/* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */ /* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */

View File

@ -6,8 +6,8 @@
* Copyright (C) 1999 David S. Miller (davem@redhat.com) * Copyright (C) 1999 David S. Miller (davem@redhat.com)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
ENTRY(__ashldi3) ENTRY(__ashldi3)

View File

@ -6,8 +6,8 @@
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
ENTRY(__ashrdi3) ENTRY(__ashrdi3)

View File

@ -4,10 +4,10 @@
* Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net) * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/backoff.h> #include <asm/backoff.h>
#include <asm/export.h>
.text .text

View File

@ -4,10 +4,10 @@
* Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net) * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/backoff.h> #include <asm/backoff.h>
#include <asm/export.h>
.text .text

View File

@ -5,9 +5,9 @@
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/export.h>
/* Zero out 64 bytes of memory at (buf + offset). /* Zero out 64 bytes of memory at (buf + offset).
* Assumes %g1 contains zero. * Assumes %g1 contains zero.

View File

@ -5,8 +5,8 @@
* Copyright (C) 2005 David S. Miller <davem@davemloft.net> * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text

View File

@ -14,8 +14,8 @@
* BSD4.4 portable checksum routine * BSD4.4 portable checksum routine
*/ */
#include <linux/export.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/export.h>
#define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \ #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \
ldd [buf + offset + 0x00], t0; \ ldd [buf + offset + 0x00], t0; \

View File

@ -14,7 +14,7 @@
* BSD4.4 portable checksum routine * BSD4.4 portable checksum routine
*/ */
#include <asm/export.h> #include <linux/export.h>
.text .text
csum_partial_fix_alignment: csum_partial_fix_alignment:

View File

@ -5,13 +5,13 @@
* Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
*/ */
#include <linux/export.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/head.h> #include <asm/head.h>
#include <asm/export.h>
/* What we used to do was lock a TLB entry into a specific /* What we used to do was lock a TLB entry into a specific
* TLB slot, clear the page with interrupts disabled, then * TLB slot, clear the page with interrupts disabled, then

View File

@ -4,9 +4,9 @@
* Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com) * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/export.h>
#define XCC xcc #define XCC xcc

View File

@ -5,13 +5,13 @@
* Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com)
*/ */
#include <linux/export.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/page.h> #include <asm/page.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/head.h> #include <asm/head.h>
#include <asm/export.h>
/* What we used to do was lock a TLB entry into a specific /* What we used to do was lock a TLB entry into a specific
* TLB slot, clear the page with interrupts disabled, then * TLB slot, clear the page with interrupts disabled, then

View File

@ -12,11 +12,11 @@
* Returns 0 if successful, otherwise count of bytes not copied yet * Returns 0 if successful, otherwise count of bytes not copied yet
*/ */
#include <linux/export.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/export.h>
/* Work around cpp -rob */ /* Work around cpp -rob */
#define ALLOC #alloc #define ALLOC #alloc

View File

@ -4,7 +4,7 @@
* Copyright (C) 2005 David S. Miller <davem@davemloft.net> * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
*/ */
#include <asm/export.h> #include <linux/export.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#define GLOBAL_SPARE %g7 #define GLOBAL_SPARE %g7

View File

@ -5,7 +5,7 @@ This file is part of GNU CC.
*/ */
#include <asm/export.h> #include <linux/export.h>
.text .text
.align 4 .align 4
.globl __divdi3 .globl __divdi3

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.register %g2,#scratch .register %g2,#scratch

View File

@ -5,8 +5,8 @@
* and onward. * and onward.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
.register %g2, #scratch .register %g2, #scratch

View File

@ -5,8 +5,8 @@
* and onward. * and onward.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
.register %g2, #scratch .register %g2, #scratch

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
.align 32 .align 32

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */ ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */

View File

@ -7,11 +7,11 @@
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/ */
#include <linux/export.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/psr.h> #include <asm/psr.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/spinlock.h> #include <asm/spinlock.h>
#include <asm/export.h>
.text .text
.align 4 .align 4

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
ENTRY(__lshrdi3) ENTRY(__lshrdi3)
cmp %o2, 0 cmp %o2, 0

View File

@ -6,8 +6,8 @@
* This can also be tweaked for kernel stack overflow detection. * This can also be tweaked for kernel stack overflow detection.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
/* /*
* This is the main variant and is called by C code. GCC's -pg option * This is the main variant and is called by C code. GCC's -pg option

View File

@ -5,9 +5,9 @@
* Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net) * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
.text .text
ENTRY(memcmp) ENTRY(memcmp)

View File

@ -8,7 +8,8 @@
* Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/ */
#include <asm/export.h> #include <linux/export.h>
#define FUNC(x) \ #define FUNC(x) \
.globl x; \ .globl x; \
.type x,@function; \ .type x,@function; \

View File

@ -5,8 +5,8 @@
* Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz) * Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
ENTRY(memmove) /* o0=dst o1=src o2=len */ ENTRY(memmove) /* o0=dst o1=src o2=len */

View File

@ -5,7 +5,7 @@
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) * 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. */ /* In essence, this is just a fancy strlen. */

View File

@ -6,7 +6,7 @@
* Copyright (C) 1998 David S. Miller (davem@redhat.com) * Copyright (C) 1998 David S. Miller (davem@redhat.com)
*/ */
#include <asm/export.h> #include <linux/export.h>
#define HI_MAGIC 0x8080808080808080 #define HI_MAGIC 0x8080808080808080
#define LO_MAGIC 0x0101010101010101 #define LO_MAGIC 0x0101010101010101

View File

@ -9,8 +9,8 @@
* clear_user. * clear_user.
*/ */
#include <linux/export.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/export.h>
/* Work around cpp -rob */ /* Work around cpp -rob */
#define ALLOC #alloc #define ALLOC #alloc

View File

@ -5,7 +5,7 @@ This file is part of GNU CC.
*/ */
#include <asm/export.h> #include <linux/export.h>
.text .text
.align 4 .align 4
.globl __muldi3 .globl __muldi3

View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
.align 4 .align 4

View File

@ -6,9 +6,9 @@
* Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
#define LO_MAGIC 0x01010101 #define LO_MAGIC 0x01010101
#define HI_MAGIC 0x80808080 #define HI_MAGIC 0x80808080

View File

@ -4,8 +4,8 @@
* generic strncmp routine. * generic strncmp routine.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
.text .text
ENTRY(strncmp) ENTRY(strncmp)

View File

@ -5,9 +5,9 @@
* Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/export.h>
.text .text
ENTRY(strncmp) ENTRY(strncmp)

View File

@ -9,12 +9,12 @@
* Copyright (C) 2006 David S. Miller <davem@davemloft.net> * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/visasm.h> #include <asm/visasm.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/dcu.h> #include <asm/dcu.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/export.h>
/* /*
* Requirements: * Requirements: