tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Masahiro Yamada 4cdb71b6 1fdd7290

+40 -39
+1 -1
arch/sparc/kernel/entry.S
··· 8 8 * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au) 9 9 */ 10 10 11 + #include <linux/export.h> 11 12 #include <linux/linkage.h> 12 13 #include <linux/errno.h> 13 14 #include <linux/pgtable.h> ··· 31 30 #include <asm/unistd.h> 32 31 33 32 #include <asm/asmmacro.h> 34 - #include <asm/export.h> 35 33 36 34 #define curptr g6 37 35
+1 -1
arch/sparc/kernel/head_32.S
··· 11 11 * CompactPCI platform by Eric Brower, 1999. 12 12 */ 13 13 14 + #include <linux/export.h> 14 15 #include <linux/version.h> 15 16 #include <linux/init.h> 16 17 ··· 26 25 #include <asm/thread_info.h> /* TI_UWINMASK */ 27 26 #include <asm/errno.h> 28 27 #include <asm/pgtable.h> /* PGDIR_SHIFT */ 29 - #include <asm/export.h> 30 28 31 29 .data 32 30 /* The following are used with the prom_vector node-ops to figure out
+1 -1
arch/sparc/kernel/head_64.S
··· 9 9 10 10 #include <linux/version.h> 11 11 #include <linux/errno.h> 12 + #include <linux/export.h> 12 13 #include <linux/threads.h> 13 14 #include <linux/init.h> 14 15 #include <linux/linkage.h> ··· 34 33 #include <asm/estate.h> 35 34 #include <asm/sfafsr.h> 36 35 #include <asm/unistd.h> 37 - #include <asm/export.h> 38 36 39 37 /* This section from from _start to sparc64_boot_end should fit into 40 38 * 0x0000000000404000 to 0x0000000000408000.
+1 -1
arch/sparc/lib/U1memcpy.S
··· 6 6 */ 7 7 8 8 #ifdef __KERNEL__ 9 + #include <linux/export.h> 9 10 #include <linux/linkage.h> 10 11 #include <asm/visasm.h> 11 12 #include <asm/asi.h> 12 - #include <asm/export.h> 13 13 #define GLOBAL_SPARE g7 14 14 #else 15 15 #define GLOBAL_SPARE g5
+1 -1
arch/sparc/lib/VISsave.S
··· 7 7 * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) 8 8 */ 9 9 10 + #include <linux/export.h> 10 11 #include <linux/linkage.h> 11 12 12 13 #include <asm/asi.h> ··· 15 14 #include <asm/ptrace.h> 16 15 #include <asm/visasm.h> 17 16 #include <asm/thread_info.h> 18 - #include <asm/export.h> 19 17 20 18 /* On entry: %o5=current FPRS value, %g7 is callers address */ 21 19 /* May clobber %o5, %g1, %g2, %g3, %g7, %icc, %xcc */
+1 -1
arch/sparc/lib/ashldi3.S
··· 6 6 * Copyright (C) 1999 David S. Miller (davem@redhat.com) 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <linux/linkage.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13 ENTRY(__ashldi3)
+1 -1
arch/sparc/lib/ashrdi3.S
··· 6 6 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <linux/linkage.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13 ENTRY(__ashrdi3)
+1 -1
arch/sparc/lib/atomic_64.S
··· 4 4 * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net) 5 5 */ 6 6 7 + #include <linux/export.h> 7 8 #include <linux/linkage.h> 8 9 #include <asm/asi.h> 9 10 #include <asm/backoff.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13
+1 -1
arch/sparc/lib/bitops.S
··· 4 4 * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net) 5 5 */ 6 6 7 + #include <linux/export.h> 7 8 #include <linux/linkage.h> 8 9 #include <asm/asi.h> 9 10 #include <asm/backoff.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13
+1 -1
arch/sparc/lib/blockops.S
··· 5 5 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 10 #include <asm/page.h> 10 - #include <asm/export.h> 11 11 12 12 /* Zero out 64 bytes of memory at (buf + offset). 13 13 * Assumes %g1 contains zero.
+1 -1
arch/sparc/lib/bzero.S
··· 5 5 * Copyright (C) 2005 David S. Miller <davem@davemloft.net> 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 - #include <asm/export.h> 10 10 11 11 .text 12 12
+1 -1
arch/sparc/lib/checksum_32.S
··· 14 14 * BSD4.4 portable checksum routine 15 15 */ 16 16 17 + #include <linux/export.h> 17 18 #include <asm/errno.h> 18 - #include <asm/export.h> 19 19 20 20 #define CSUM_BIGCHUNK(buf, offset, sum, t0, t1, t2, t3, t4, t5) \ 21 21 ldd [buf + offset + 0x00], t0; \
+1 -1
arch/sparc/lib/checksum_64.S
··· 14 14 * BSD4.4 portable checksum routine 15 15 */ 16 16 17 - #include <asm/export.h> 17 + #include <linux/export.h> 18 18 .text 19 19 20 20 csum_partial_fix_alignment:
+1 -1
arch/sparc/lib/clear_page.S
··· 5 5 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/pgtable.h> 9 10 #include <asm/visasm.h> 10 11 #include <asm/thread_info.h> 11 12 #include <asm/page.h> 12 13 #include <asm/spitfire.h> 13 14 #include <asm/head.h> 14 - #include <asm/export.h> 15 15 16 16 /* What we used to do was lock a TLB entry into a specific 17 17 * TLB slot, clear the page with interrupts disabled, then
+1 -1
arch/sparc/lib/copy_in_user.S
··· 4 4 * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com) 5 5 */ 6 6 7 + #include <linux/export.h> 7 8 #include <linux/linkage.h> 8 9 #include <asm/asi.h> 9 - #include <asm/export.h> 10 10 11 11 #define XCC xcc 12 12
+1 -1
arch/sparc/lib/copy_page.S
··· 5 5 * Copyright (C) 1997 Jakub Jelinek (jakub@redhat.com) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <asm/visasm.h> 9 10 #include <asm/thread_info.h> 10 11 #include <asm/page.h> 11 12 #include <linux/pgtable.h> 12 13 #include <asm/spitfire.h> 13 14 #include <asm/head.h> 14 - #include <asm/export.h> 15 15 16 16 /* What we used to do was lock a TLB entry into a specific 17 17 * TLB slot, clear the page with interrupts disabled, then
+1 -1
arch/sparc/lib/copy_user.S
··· 12 12 * Returns 0 if successful, otherwise count of bytes not copied yet 13 13 */ 14 14 15 + #include <linux/export.h> 15 16 #include <asm/ptrace.h> 16 17 #include <asm/asmmacro.h> 17 18 #include <asm/page.h> 18 19 #include <asm/thread_info.h> 19 - #include <asm/export.h> 20 20 21 21 /* Work around cpp -rob */ 22 22 #define ALLOC #alloc
+1 -1
arch/sparc/lib/csum_copy.S
··· 4 4 * Copyright (C) 2005 David S. Miller <davem@davemloft.net> 5 5 */ 6 6 7 - #include <asm/export.h> 7 + #include <linux/export.h> 8 8 9 9 #ifdef __KERNEL__ 10 10 #define GLOBAL_SPARE %g7
+1 -1
arch/sparc/lib/divdi3.S
··· 5 5 6 6 */ 7 7 8 - #include <asm/export.h> 8 + #include <linux/export.h> 9 9 .text 10 10 .align 4 11 11 .globl __divdi3
+1 -1
arch/sparc/lib/ffs.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 - #include <asm/export.h> 4 4 5 5 .register %g2,#scratch 6 6
+1 -1
arch/sparc/lib/fls.S
··· 5 5 * and onward. 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 - #include <asm/export.h> 10 10 11 11 .text 12 12 .register %g2, #scratch
+1 -1
arch/sparc/lib/fls64.S
··· 5 5 * and onward. 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 - #include <asm/export.h> 10 10 11 11 .text 12 12 .register %g2, #scratch
+1 -1
arch/sparc/lib/hweight.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 - #include <asm/export.h> 4 4 5 5 .text 6 6 .align 32
+1 -1
arch/sparc/lib/ipcsum.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 - #include <asm/export.h> 4 4 5 5 .text 6 6 ENTRY(ip_fast_csum) /* %o0 = iph, %o1 = ihl */
+1 -1
arch/sparc/lib/locks.S
··· 7 7 * Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) 8 8 */ 9 9 10 + #include <linux/export.h> 10 11 #include <asm/ptrace.h> 11 12 #include <asm/psr.h> 12 13 #include <asm/smp.h> 13 14 #include <asm/spinlock.h> 14 - #include <asm/export.h> 15 15 16 16 .text 17 17 .align 4
+1 -1
arch/sparc/lib/lshrdi3.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 - #include <asm/export.h> 4 4 5 5 ENTRY(__lshrdi3) 6 6 cmp %o2, 0
+1 -1
arch/sparc/lib/mcount.S
··· 6 6 * This can also be tweaked for kernel stack overflow detection. 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <linux/linkage.h> 10 - #include <asm/export.h> 11 11 12 12 /* 13 13 * This is the main variant and is called by C code. GCC's -pg option
+1 -1
arch/sparc/lib/memcmp.S
··· 5 5 * Copyright (C) 2000, 2008 David S. Miller (davem@davemloft.net) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 10 #include <asm/asm.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13 ENTRY(memcmp)
+2 -1
arch/sparc/lib/memcpy.S
··· 8 8 * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz) 9 9 */ 10 10 11 - #include <asm/export.h> 11 + #include <linux/export.h> 12 + 12 13 #define FUNC(x) \ 13 14 .globl x; \ 14 15 .type x,@function; \
+1 -1
arch/sparc/lib/memmove.S
··· 5 5 * Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek (jj@ultra.linux.cz) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 - #include <asm/export.h> 10 10 11 11 .text 12 12 ENTRY(memmove) /* o0=dst o1=src o2=len */
+1 -1
arch/sparc/lib/memscan_32.S
··· 5 5 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) 6 6 */ 7 7 8 - #include <asm/export.h> 8 + #include <linux/export.h> 9 9 10 10 /* In essence, this is just a fancy strlen. */ 11 11
+1 -1
arch/sparc/lib/memscan_64.S
··· 6 6 * Copyright (C) 1998 David S. Miller (davem@redhat.com) 7 7 */ 8 8 9 - #include <asm/export.h> 9 + #include <linux/export.h> 10 10 11 11 #define HI_MAGIC 0x8080808080808080 12 12 #define LO_MAGIC 0x0101010101010101
+1 -1
arch/sparc/lib/memset.S
··· 9 9 * clear_user. 10 10 */ 11 11 12 + #include <linux/export.h> 12 13 #include <asm/ptrace.h> 13 - #include <asm/export.h> 14 14 15 15 /* Work around cpp -rob */ 16 16 #define ALLOC #alloc
+1 -1
arch/sparc/lib/muldi3.S
··· 5 5 6 6 */ 7 7 8 - #include <asm/export.h> 8 + #include <linux/export.h> 9 9 .text 10 10 .align 4 11 11 .globl __muldi3
+1 -1
arch/sparc/lib/multi3.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 - #include <asm/export.h> 4 4 5 5 .text 6 6 .align 4
+1 -1
arch/sparc/lib/strlen.S
··· 6 6 * Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <linux/linkage.h> 10 11 #include <asm/asm.h> 11 - #include <asm/export.h> 12 12 13 13 #define LO_MAGIC 0x01010101 14 14 #define HI_MAGIC 0x80808080
+1 -1
arch/sparc/lib/strncmp_32.S
··· 4 4 * generic strncmp routine. 5 5 */ 6 6 7 + #include <linux/export.h> 7 8 #include <linux/linkage.h> 8 - #include <asm/export.h> 9 9 10 10 .text 11 11 ENTRY(strncmp)
+1 -1
arch/sparc/lib/strncmp_64.S
··· 5 5 * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <linux/linkage.h> 9 10 #include <asm/asi.h> 10 - #include <asm/export.h> 11 11 12 12 .text 13 13 ENTRY(strncmp)
+1 -1
arch/sparc/lib/xor.S
··· 9 9 * Copyright (C) 2006 David S. Miller <davem@davemloft.net> 10 10 */ 11 11 12 + #include <linux/export.h> 12 13 #include <linux/linkage.h> 13 14 #include <asm/visasm.h> 14 15 #include <asm/asi.h> 15 16 #include <asm/dcu.h> 16 17 #include <asm/spitfire.h> 17 - #include <asm/export.h> 18 18 19 19 /* 20 20 * Requirements: