sparc: replace #include <asm/export.h> with #include <linux/export.h>
PATCH 1/6 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.
---
arch/sparc/kernel/entry.S | 2 +- arch/sparc/kernel/head_32.S | 2 +- arch/sparc/kernel/head_64.S | 2 +- arch/sparc/lib/U1memcpy.S | 2 +- arch/sparc/lib/VISsave.S | 2 +- arch/sparc/lib/ashldi3.S | 2 +- arch/sparc/lib/ashrdi3.S | 2 +- arch/sparc/lib/atomic_64.S | 2 +- arch/sparc/lib/bitops.S | 2 +- arch/sparc/lib/blockops.S | 2 +- arch/sparc/lib/bzero.S | 2 +- arch/sparc/lib/checksum_32.S | 2 +- arch/sparc/lib/checksum_64.S | 2 +- arch/sparc/lib/clear_page.S | 2 +- arch/sparc/lib/copy_in_user.S | 2 +- arch/sparc/lib/copy_page.S | 2 +- arch/sparc/lib/copy_user.S | 2 +- arch/sparc/lib/csum_copy.S | 2 +- arch/sparc/lib/divdi3.S | 2 +- arch/sparc/lib/ffs.S | 2 +- arch/sparc/lib/fls.S | 2 +- arch/sparc/lib/fls64.S | 2 +- arch/sparc/lib/hweight.S | 2 +- arch/sparc/lib/ipcsum.S | 2 +- arch/sparc/lib/locks.S | 2 +- arch/sparc/lib/lshrdi3.S | 2 +- arch/sparc/lib/mcount.S | 2 +- arch/sparc/lib/memcmp.S | 2 +- arch/sparc/lib/memcpy.S | 3 ++- arch/sparc/lib/memmove.S | 2 +- arch/sparc/lib/memscan_32.S | 2 +- arch/sparc/lib/memscan_64.S | 2 +- arch/sparc/lib/memset.S | 2 +- arch/sparc/lib/muldi3.S | 2 +- arch/sparc/lib/multi3.S | 2 +- arch/sparc/lib/strlen.S | 2 +- arch/sparc/lib/strncmp_32.S | 2 +- arch/sparc/lib/strncmp_64.S | 2 +- arch/sparc/lib/xor.S | 2 +- 39 files changed, 40 insertions(+), 39 deletions(-)
arch/sparc/kernel/entry.S +1 -1
@@ -8,6 +8,7 @@ * Copyright (C) 1997 Anton Blanchard ([email protected]) */ +#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
arch/sparc/kernel/head_32.S +1 -1
@@ -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
arch/sparc/kernel/head_64.S +1 -1
@@ -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.
arch/sparc/lib/U1memcpy.S +1 -1
@@ -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
arch/sparc/lib/VISsave.S +1 -1
@@ -7,6 +7,7 @@ * Copyright (C) 1998 Jakub Jelinek ([email protected]) */ +#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 */
arch/sparc/lib/ashldi3.S +1 -1
@@ -6,8 +6,8 @@ * Copyright (C) 1999 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text ENTRY(__ashldi3)
arch/sparc/lib/ashrdi3.S +1 -1
@@ -6,8 +6,8 @@ * Copyright (C) 1995 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text ENTRY(__ashrdi3)
arch/sparc/lib/atomic_64.S +1 -1
@@ -4,10 +4,10 @@ * Copyright (C) 1999, 2007 2012 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asi.h> #include <asm/backoff.h> -#include <asm/export.h> .text
arch/sparc/lib/bitops.S +1 -1
@@ -4,10 +4,10 @@ * Copyright (C) 2000, 2007 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asi.h> #include <asm/backoff.h> -#include <asm/export.h> .text
arch/sparc/lib/blockops.S +1 -1
@@ -5,9 +5,9 @@ * Copyright (C) 1996 David S. Miller ([email protected]) */ +#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.
arch/sparc/lib/bzero.S +1 -1
@@ -5,8 +5,8 @@ * Copyright (C) 2005 David S. Miller <[email protected]> */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text
arch/sparc/lib/checksum_32.S +1 -1
@@ -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; \
arch/sparc/lib/checksum_64.S +1 -1
@@ -14,7 +14,7 @@ * BSD4.4 portable checksum routine */ -#include <asm/export.h> +#include <linux/export.h> .text csum_partial_fix_alignment:
arch/sparc/lib/clear_page.S +1 -1
@@ -5,13 +5,13 @@ * Copyright (C) 1997 Jakub Jelinek ([email protected]) */ +#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
arch/sparc/lib/copy_in_user.S +1 -1
@@ -4,9 +4,9 @@ * Copyright (C) 1999, 2000, 2004 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asi.h> -#include <asm/export.h> #define XCC xcc
arch/sparc/lib/copy_page.S +1 -1
@@ -5,13 +5,13 @@ * Copyright (C) 1997 Jakub Jelinek ([email protected]) */ +#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
arch/sparc/lib/copy_user.S +1 -1
@@ -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
arch/sparc/lib/csum_copy.S +1 -1
@@ -4,7 +4,7 @@ * Copyright (C) 2005 David S. Miller <[email protected]> */ -#include <asm/export.h> +#include <linux/export.h> #ifdef __KERNEL__ #define GLOBAL_SPARE %g7
arch/sparc/lib/divdi3.S +1 -1
@@ -5,7 +5,7 @@ This file is part of GNU CC. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .globl __divdi3
arch/sparc/lib/ffs.S +1 -1
@@ -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
arch/sparc/lib/fls.S +1 -1
@@ -5,8 +5,8 @@ * and onward. */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text .register %g2, #scratch
arch/sparc/lib/fls64.S +1 -1
@@ -5,8 +5,8 @@ * and onward. */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text .register %g2, #scratch
arch/sparc/lib/hweight.S +1 -1
@@ -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
arch/sparc/lib/ipcsum.S +1 -1
@@ -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 */
arch/sparc/lib/locks.S +1 -1
@@ -7,11 +7,11 @@ * Copyright (C) 1998 Jakub Jelinek ([email protected]) */ +#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
arch/sparc/lib/lshrdi3.S +1 -1
@@ -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
arch/sparc/lib/mcount.S +1 -1
@@ -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
arch/sparc/lib/memcmp.S +1 -1
@@ -5,9 +5,9 @@ * Copyright (C) 2000, 2008 David S. Miller ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asm.h> -#include <asm/export.h> .text ENTRY(memcmp)
arch/sparc/lib/memcpy.S +2 -1
@@ -8,7 +8,8 @@ * Copyright (C) 1996 Jakub Jelinek ([email protected]) */ -#include <asm/export.h> +#include <linux/export.h> + #define FUNC(x) \ .globl x; \ .type x,@function; \
arch/sparc/lib/memmove.S +1 -1
@@ -5,8 +5,8 @@ * Copyright (C) 1996, 1997, 1998, 1999 Jakub Jelinek ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text ENTRY(memmove) /* o0=dst o1=src o2=len */
arch/sparc/lib/memscan_32.S +1 -1
@@ -5,7 +5,7 @@ * Copyright (C) 1996 David S. Miller ([email protected]) */ -#include <asm/export.h> +#include <linux/export.h> /* In essence, this is just a fancy strlen. */
arch/sparc/lib/memscan_64.S +1 -1
@@ -6,7 +6,7 @@ * Copyright (C) 1998 David S. Miller ([email protected]) */ - #include <asm/export.h> +#include <linux/export.h> #define HI_MAGIC 0x8080808080808080 #define LO_MAGIC 0x0101010101010101
arch/sparc/lib/memset.S +1 -1
@@ -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
arch/sparc/lib/muldi3.S +1 -1
@@ -5,7 +5,7 @@ This file is part of GNU CC. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .globl __muldi3
arch/sparc/lib/multi3.S +1 -1
@@ -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
arch/sparc/lib/strlen.S +1 -1
@@ -6,9 +6,9 @@ * Copyright (C) 1996, 1997 Jakub Jelinek ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asm.h> -#include <asm/export.h> #define LO_MAGIC 0x01010101 #define HI_MAGIC 0x80808080
arch/sparc/lib/strncmp_32.S +1 -1
@@ -4,8 +4,8 @@ * generic strncmp routine. */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> .text ENTRY(strncmp)
arch/sparc/lib/strncmp_64.S +1 -1
@@ -5,9 +5,9 @@ * Copyright (C) 1997 Jakub Jelinek ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/asi.h> -#include <asm/export.h> .text ENTRY(strncmp)
arch/sparc/lib/xor.S +1 -1
@@ -9,12 +9,12 @@ * Copyright (C) 2006 David S. Miller <[email protected]> */ +#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:
Signature · 1 line
2.39.2
PATCH 2/6 sparc: remove <asm/export.h>
All *.S files under arch/sparc/ have been converted to include <linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
---
arch/sparc/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-)
arch/sparc/include/asm/Kbuild +0 -1
@@ -2,6 +2,5 @@ generated-y += syscall_table_32.h generated-y += syscall_table_64.h generic-y += agp.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h
Signature · 1 line
2.39.2
Re: [PATCH 2/6] sparc: remove <asm/export.h>
Quoted 6 lines · Masahiro Yamada
All *.S files under
arch/sparc/have been converted to include <linux/export.h> instead of <asm/export.h>.Remove <
asm/export.h>.Signed-off-by Masahiro Yamada <[email protected]>
PATCH 3/6 ia64: replace #include <asm/export.h> with #include <linux/export.h>
In reply to Masahiro YamadaCommit 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.
---
arch/ia64/kernel/entry.S | 3 +-- arch/ia64/kernel/esi_stub.S | 2 +- arch/ia64/kernel/head.S | 3 +-- arch/ia64/kernel/ivt.S | 3 +-- arch/ia64/kernel/pal.S | 2 +- arch/ia64/lib/clear_page.S | 2 +- arch/ia64/lib/clear_user.S | 2 +- arch/ia64/lib/copy_page.S | 2 +- arch/ia64/lib/copy_page_mck.S | 2 +- arch/ia64/lib/copy_user.S | 2 +- arch/ia64/lib/flush.S | 3 +-- arch/ia64/lib/idiv32.S | 2 +- arch/ia64/lib/idiv64.S | 2 +- arch/ia64/lib/ip_fast_csum.S | 2 +- arch/ia64/lib/memcpy.S | 2 +- arch/ia64/lib/memcpy_mck.S | 2 +- arch/ia64/lib/memset.S | 2 +- arch/ia64/lib/strlen.S | 2 +- arch/ia64/lib/strncpy_from_user.S | 2 +- arch/ia64/lib/strnlen_user.S | 2 +- arch/ia64/lib/xor.S | 2 +- 21 files changed, 21 insertions(+), 25 deletions(-)
arch/ia64/kernel/entry.S +1 -2
@@ -37,7 +37,7 @@ * pNonSys: !pSys */ - +#include <linux/export.h> #include <linux/pgtable.h> #include <asm/asmmacro.h> #include <asm/cache.h>
@@ -49,7 +49,6 @@ #include <asm/thread_info.h> #include <asm/unistd.h> #include <asm/ftrace.h> -#include <asm/export.h> #include "minstate.h"
arch/ia64/kernel/esi_stub.S +1 -1
@@ -34,9 +34,9 @@ #define PSR_BITS_TO_SET \ (IA64_PSR_BN) +#include <linux/export.h> #include <asm/processor.h> #include <asm/asmmacro.h> -#include <asm/export.h> /* * Inputs:
arch/ia64/kernel/head.S +1 -2
@@ -20,7 +20,7 @@ * Support for CPU Hotplug */ - +#include <linux/export.h> #include <linux/pgtable.h> #include <asm/asmmacro.h> #include <asm/fpu.h>
@@ -33,7 +33,6 @@ #include <asm/mca_asm.h> #include <linux/init.h> #include <linux/linkage.h> -#include <asm/export.h> #ifdef CONFIG_HOTPLUG_CPU #define SAL_PSR_BITS_TO_SET \
arch/ia64/kernel/ivt.S +1 -2
@@ -47,7 +47,7 @@ * Table is based upon EAS2.6 (Oct 1999) */ - +#include <linux/export.h> #include <linux/pgtable.h> #include <asm/asmmacro.h> #include <asm/break.h>
@@ -58,7 +58,6 @@ #include <asm/thread_info.h> #include <asm/unistd.h> #include <asm/errno.h> -#include <asm/export.h> #if 0 # define PSR_DEFAULT_BITS psr.ac
arch/ia64/kernel/pal.S +1 -1
@@ -13,9 +13,9 @@ * 05/24/2000 eranian Added support for physical mode static calls */ +#include <linux/export.h> #include <asm/asmmacro.h> #include <asm/processor.h> -#include <asm/export.h> .data pal_entry_point:
arch/ia64/lib/clear_page.S +1 -1
@@ -10,9 +10,9 @@ * 3/08/02 davidm Some more tweaking */ +#include <linux/export.h> #include <asm/asmmacro.h> #include <asm/page.h> -#include <asm/export.h> #ifdef CONFIG_ITANIUM # define L3_LINE_SIZE 64 // Itanium L3 line size
arch/ia64/lib/clear_user.S +1 -1
@@ -12,8 +12,8 @@ * Stephane Eranian <[email protected]> */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> // // arguments
arch/ia64/lib/copy_page.S +1 -1
@@ -15,9 +15,9 @@ * * 4/06/01 davidm Tuned to make it perform well both for cached and uncached copies. */ +#include <linux/export.h> #include <asm/asmmacro.h> #include <asm/page.h> -#include <asm/export.h> #define PIPE_DEPTH 3 #define EPI p[PIPE_DEPTH-1]
arch/ia64/lib/copy_page_mck.S +1 -1
@@ -60,9 +60,9 @@ * to fetch the second-half of the L2 cache line into L1, and the tX words are copied in * an order that avoids bank conflicts. */ +#include <linux/export.h> #include <asm/asmmacro.h> #include <asm/page.h> -#include <asm/export.h> #define PREFETCH_DIST 8 // McKinley sustains 16 outstanding L2 misses (8 ld, 8 st)
arch/ia64/lib/copy_user.S +1 -1
@@ -30,8 +30,8 @@ * - fix extraneous stop bit introduced by the EX() macro. */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> // // Tuneable parameters
arch/ia64/lib/flush.S +1 -2
@@ -8,9 +8,8 @@ * 05/28/05 Zoltan Menyhart Dynamic stride size */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> - /* * flush_icache_range(start,end)
arch/ia64/lib/idiv32.S +1 -1
@@ -15,8 +15,8 @@ * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions) */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> #ifdef MODULO # define OP mod
arch/ia64/lib/idiv64.S +1 -1
@@ -15,8 +15,8 @@ * (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions) */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> #ifdef MODULO # define OP mod
arch/ia64/lib/ip_fast_csum.S +1 -1
@@ -13,8 +13,8 @@ * Copyright (C) 2002, 2006 Ken Chen <[email protected]> */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> /* * Since we know that most likely this function is called with buf aligned
arch/ia64/lib/memcpy.S +1 -1
@@ -14,8 +14,8 @@ * Stephane Eranian <[email protected]> * David Mosberger-Tang <[email protected]> */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> GLOBAL_ENTRY(memcpy)
arch/ia64/lib/memcpy_mck.S +1 -1
@@ -14,9 +14,9 @@ * Copyright (C) 2002 Intel Corp. * Copyright (C) 2002 Ken Chen <[email protected]> */ +#include <linux/export.h> #include <asm/asmmacro.h> #include <asm/page.h> -#include <asm/export.h> #define EK(y...) EX(y)
arch/ia64/lib/memset.S +1 -1
@@ -18,8 +18,8 @@ Since a stf.spill f0 can store 16B in one go, we use this instruction to get peak speed when value = 0. */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> #undef ret #define dest in0
arch/ia64/lib/strlen.S +1 -1
@@ -17,8 +17,8 @@ * 09/24/99 S.Eranian add speculation recovery code */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> // //
arch/ia64/lib/strncpy_from_user.S +1 -1
@@ -17,8 +17,8 @@ * by Andreas Schwab <[email protected]>). */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> GLOBAL_ENTRY(__strncpy_from_user) alloc r2=ar.pfs,3,0,0,0
arch/ia64/lib/strnlen_user.S +1 -1
@@ -13,8 +13,8 @@ * Copyright (C) 1999, 2001 David Mosberger-Tang <[email protected]> */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> GLOBAL_ENTRY(__strnlen_user) .prologue
arch/ia64/lib/xor.S +1 -1
@@ -5,8 +5,8 @@ * Optimized RAID-5 checksumming functions for IA-64. */ +#include <linux/export.h> #include <asm/asmmacro.h> -#include <asm/export.h> GLOBAL_ENTRY(xor_ia64_2) .prologue
Signature · 1 line
2.39.2
PATCH 4/6 ia64: remove <asm/export.h>
In reply to Masahiro YamadaAll *.S files under arch/ia64/ have been converted to include <linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
---
arch/ia64/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-)
arch/ia64/include/asm/Kbuild +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 generated-y += syscall_table.h generic-y += agp.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += vtime.h
Signature · 1 line
2.39.2
PATCH 5/6 alpha: replace #include <asm/export.h> with #include <linux/export.h>
In reply to Masahiro YamadaCommit 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.
---
arch/alpha/lib/callback_srm.S | 2 +- arch/alpha/lib/clear_page.S | 2 +- arch/alpha/lib/clear_user.S | 2 +- arch/alpha/lib/copy_page.S | 2 +- arch/alpha/lib/copy_user.S | 2 +- arch/alpha/lib/csum_ipv6_magic.S | 2 +- arch/alpha/lib/divide.S | 2 +- arch/alpha/lib/ev6-clear_page.S | 2 +- arch/alpha/lib/ev6-clear_user.S | 2 +- arch/alpha/lib/ev6-copy_page.S | 2 +- arch/alpha/lib/ev6-copy_user.S | 2 +- arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 +- arch/alpha/lib/ev6-divide.S | 2 +- arch/alpha/lib/ev6-memchr.S | 2 +- arch/alpha/lib/ev6-memcpy.S | 2 +- arch/alpha/lib/ev6-memset.S | 2 +- arch/alpha/lib/ev67-strcat.S | 2 +- arch/alpha/lib/ev67-strchr.S | 2 +- arch/alpha/lib/ev67-strlen.S | 2 +- arch/alpha/lib/ev67-strncat.S | 2 +- arch/alpha/lib/ev67-strrchr.S | 2 +- arch/alpha/lib/memchr.S | 2 +- arch/alpha/lib/memmove.S | 2 +- arch/alpha/lib/memset.S | 2 +- arch/alpha/lib/strcat.S | 2 +- arch/alpha/lib/strchr.S | 2 +- arch/alpha/lib/strcpy.S | 2 +- arch/alpha/lib/strlen.S | 2 +- arch/alpha/lib/strncat.S | 2 +- arch/alpha/lib/strncpy.S | 2 +- arch/alpha/lib/strrchr.S | 2 +- arch/alpha/lib/udiv-qrnnd.S | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-)
arch/alpha/lib/callback_srm.S +1 -1
@@ -3,8 +3,8 @@ * arch/alpha/lib/callback_srm.S */ +#include <linux/export.h> #include <asm/console.h> -#include <asm/export.h> .text #define HWRPB_CRB_OFFSET 0xc0
arch/alpha/lib/clear_page.S +1 -1
@@ -4,7 +4,7 @@ * * Zero an entire page. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .global clear_page
arch/alpha/lib/clear_user.S +1 -1
@@ -10,7 +10,7 @@ * a successful copy). There is also some rather minor exception setup * stuff. */ -#include <asm/export.h> +#include <linux/export.h> /* Allow an exception for an insn; exit if we get one. */ #define EX(x,y...) \
arch/alpha/lib/copy_page.S +1 -1
@@ -4,7 +4,7 @@ * * Copy an entire page. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .global copy_page
arch/alpha/lib/copy_user.S +1 -1
@@ -12,7 +12,7 @@ * exception setup stuff.. */ -#include <asm/export.h> +#include <linux/export.h> /* Allow an exception for an insn; exit if we get one. */ #define EXI(x,y...) \
arch/alpha/lib/csum_ipv6_magic.S +1 -1
@@ -13,7 +13,7 @@ * added by Ivan Kokshaysky <[email protected]> */ -#include <asm/export.h> +#include <linux/export.h> .globl csum_ipv6_magic .align 4 .ent csum_ipv6_magic
arch/alpha/lib/divide.S +1 -1
@@ -46,7 +46,7 @@ * $28 - compare status */ -#include <asm/export.h> +#include <linux/export.h> #define halt .long 0 /*
arch/alpha/lib/ev6-clear_page.S +1 -1
@@ -4,7 +4,7 @@ * * Zero an entire page. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .global clear_page
arch/alpha/lib/ev6-clear_user.S +1 -1
@@ -29,7 +29,7 @@ * want to leave a hole (and we also want to avoid repeating lots of work) */ -#include <asm/export.h> +#include <linux/export.h> /* Allow an exception for an insn; exit if we get one. */ #define EX(x,y...) \ 99: x,##y; \
arch/alpha/lib/ev6-copy_page.S +1 -1
@@ -57,7 +57,7 @@ destination pages are in the dcache, but it is my guess that this is less important than the dcache miss case. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4 .global copy_page
arch/alpha/lib/ev6-copy_user.S +1 -1
@@ -23,7 +23,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include <asm/export.h> +#include <linux/export.h> /* Allow an exception for an insn; exit if we get one. */ #define EXI(x,y...) \ 99: x,##y; \
arch/alpha/lib/ev6-csum_ipv6_magic.S +1 -1
@@ -53,7 +53,7 @@ * may cause additional delay in rare cases (load-load replay traps). */ -#include <asm/export.h> +#include <linux/export.h> .globl csum_ipv6_magic .align 4 .ent csum_ipv6_magic
arch/alpha/lib/ev6-divide.S +1 -1
@@ -56,7 +56,7 @@ * Try not to change the actual algorithm if possible for consistency. */ -#include <asm/export.h> +#include <linux/export.h> #define halt .long 0 /*
arch/alpha/lib/ev6-memchr.S +1 -1
@@ -28,7 +28,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 * Try not to change the actual algorithm if possible for consistency. */ -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
arch/alpha/lib/ev6-memcpy.S +1 -1
@@ -20,7 +20,7 @@ * Temp usage notes: * $1,$2, - scratch */ -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
arch/alpha/lib/ev6-memset.S +1 -1
@@ -27,7 +27,7 @@ * as fixes will need to be made in multiple places. The performance gain * is worth it. */ -#include <asm/export.h> +#include <linux/export.h> .set noat .set noreorder .text
arch/alpha/lib/ev67-strcat.S +1 -1
@@ -20,7 +20,7 @@ * string once. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4
arch/alpha/lib/ev67-strchr.S +1 -1
@@ -16,7 +16,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 * Try not to change the actual algorithm if possible for consistency. */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/regdef.h> .set noreorder
arch/alpha/lib/ev67-strlen.S +1 -1
@@ -18,7 +18,7 @@ * U - upper subcluster; U0 - subcluster U0; U1 - subcluster U1 * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
arch/alpha/lib/ev67-strncat.S +1 -1
@@ -21,7 +21,7 @@ * Try not to change the actual algorithm if possible for consistency. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 4
arch/alpha/lib/ev67-strrchr.S +1 -1
@@ -19,7 +19,7 @@ * L - lower subcluster; L0 - subcluster L0; L1 - subcluster L1 */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/regdef.h> .set noreorder
arch/alpha/lib/memchr.S +1 -1
@@ -31,7 +31,7 @@ For correctness consider that: - only minimum number of quadwords may be accessed - the third argument is an unsigned long */ -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
arch/alpha/lib/memmove.S +1 -1
@@ -7,7 +7,7 @@ * This is hand-massaged output from the original memcpy.c. We defer to * memcpy whenever possible; the backwards copy loops are not unrolled. */ -#include <asm/export.h> +#include <linux/export.h> .set noat .set noreorder .text
arch/alpha/lib/memset.S +1 -1
@@ -14,7 +14,7 @@ * The scheduling comments are according to the EV5 documentation (and done by * hand, so they might well be incorrect, please do tell me about it..) */ -#include <asm/export.h> +#include <linux/export.h> .set noat .set noreorder .text
arch/alpha/lib/strcat.S +1 -1
@@ -5,7 +5,7 @@ * * Append a null-terminated string from SRC to DST. */ -#include <asm/export.h> +#include <linux/export.h> .text
arch/alpha/lib/strchr.S +1 -1
@@ -6,7 +6,7 @@ * Return the address of a given character within a null-terminated * string, or null if it is not found. */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/regdef.h> .set noreorder
arch/alpha/lib/strcpy.S +1 -1
@@ -6,7 +6,7 @@ * Copy a null-terminated string from SRC to DST. Return a pointer * to the null-terminator in the source. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 3
arch/alpha/lib/strlen.S +1 -1
@@ -12,7 +12,7 @@ * do this instead of the 9 instructions that * binary search needs). */ -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
arch/alpha/lib/strncat.S +1 -1
@@ -10,7 +10,7 @@ * past count, whereas libc may write to count+1. This follows the generic * implementation in lib/string.c and is, IMHO, more sensible. */ -#include <asm/export.h> +#include <linux/export.h> .text .align 3
arch/alpha/lib/strncpy.S +1 -1
@@ -11,7 +11,7 @@ * version has cropped that bit o' nastiness as well as assuming that * __stxncpy is in range of a branch. */ -#include <asm/export.h> +#include <linux/export.h> .set noat .set noreorder
arch/alpha/lib/strrchr.S +1 -1
@@ -6,7 +6,7 @@ * Return the address of the last occurrence of a given character * within a null-terminated string, or null if it is not found. */ -#include <asm/export.h> +#include <linux/export.h> #include <asm/regdef.h> .set noreorder
arch/alpha/lib/udiv-qrnnd.S +1 -1
@@ -25,7 +25,7 @@ # along with GCC; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -#include <asm/export.h> +#include <linux/export.h> .set noreorder .set noat
Signature · 1 line
2.39.2
PATCH 6/6 alpha: remove <asm/export.h>
In reply to Masahiro YamadaAll *.S files under arch/alpha/ have been converted to include <linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
---
arch/alpha/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-)
arch/alpha/include/asm/Kbuild +0 -1
@@ -3,6 +3,5 @@ generated-y += syscall_table.h generic-y += agp.h generic-y += asm-offsets.h -generic-y += export.h generic-y += kvm_para.h generic-y += mcs_spinlock.h
Signature · 1 line
2.39.2
Quoted 9 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]>
Thanks,