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

powerpc: 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>
[mpe: Fixup selftests that stub asm/export.h]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230806150954.394189-2-masahiroy@kernel.org

authored by

Masahiro Yamada and committed by
Michael Ellerman 39326182 3eb3f168

+29 -29
+1 -1
arch/powerpc/kernel/epapr_hcalls.S
··· 3 3 * Copyright (C) 2012 Freescale Semiconductor, Inc. 4 4 */ 5 5 6 + #include <linux/export.h> 6 7 #include <linux/threads.h> 7 8 #include <asm/epapr_hcalls.h> 8 9 #include <asm/reg.h> ··· 13 12 #include <asm/ppc_asm.h> 14 13 #include <asm/asm-compat.h> 15 14 #include <asm/asm-offsets.h> 16 - #include <asm/export.h> 17 15 18 16 #ifndef CONFIG_PPC64 19 17 /* epapr_ev_idle() was derived from e500_idle() */
+1 -1
arch/powerpc/kernel/fpu.S
··· 9 9 * Copyright (C) 1997 Dan Malek (dmalek@jlc.net). 10 10 */ 11 11 12 + #include <linux/export.h> 12 13 #include <asm/reg.h> 13 14 #include <asm/page.h> 14 15 #include <asm/mmu.h> ··· 19 18 #include <asm/ppc_asm.h> 20 19 #include <asm/asm-offsets.h> 21 20 #include <asm/ptrace.h> 22 - #include <asm/export.h> 23 21 #include <asm/asm-compat.h> 24 22 #include <asm/feature-fixups.h> 25 23
+1 -1
arch/powerpc/kernel/misc.S
··· 10 10 * 11 11 * setjmp/longjmp code by Paul Mackerras. 12 12 */ 13 + #include <linux/export.h> 13 14 #include <asm/ppc_asm.h> 14 15 #include <asm/unistd.h> 15 16 #include <asm/asm-compat.h> 16 17 #include <asm/asm-offsets.h> 17 - #include <asm/export.h> 18 18 19 19 .text 20 20
+1 -1
arch/powerpc/kernel/misc_32.S
··· 8 8 * 9 9 */ 10 10 11 + #include <linux/export.h> 11 12 #include <linux/sys.h> 12 13 #include <asm/unistd.h> 13 14 #include <asm/errno.h> ··· 23 22 #include <asm/processor.h> 24 23 #include <asm/bug.h> 25 24 #include <asm/ptrace.h> 26 - #include <asm/export.h> 27 25 #include <asm/feature-fixups.h> 28 26 29 27 .text
+1 -1
arch/powerpc/kernel/misc_64.S
··· 9 9 * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com) 10 10 */ 11 11 12 + #include <linux/export.h> 12 13 #include <linux/linkage.h> 13 14 #include <linux/sys.h> 14 15 #include <asm/unistd.h> ··· 24 23 #include <asm/kexec.h> 25 24 #include <asm/ptrace.h> 26 25 #include <asm/mmu.h> 27 - #include <asm/export.h> 28 26 #include <asm/feature-fixups.h> 29 27 30 28 .text
+1 -1
arch/powerpc/kernel/tm.S
··· 6 6 * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <asm/asm-offsets.h> 10 11 #include <asm/ppc_asm.h> 11 12 #include <asm/ppc-opcode.h> 12 13 #include <asm/ptrace.h> 13 14 #include <asm/reg.h> 14 15 #include <asm/bug.h> 15 - #include <asm/export.h> 16 16 #include <asm/feature-fixups.h> 17 17 18 18 #ifdef CONFIG_VSX
+1 -1
arch/powerpc/kernel/trace/ftrace_low.S
··· 3 3 * Split from entry_64.S 4 4 */ 5 5 6 + #include <linux/export.h> 6 7 #include <linux/magic.h> 7 8 #include <asm/ppc_asm.h> 8 9 #include <asm/asm-offsets.h> 9 10 #include <asm/ftrace.h> 10 11 #include <asm/ppc-opcode.h> 11 - #include <asm/export.h> 12 12 13 13 #ifdef CONFIG_PPC64 14 14 .pushsection ".tramp.ftrace.text","aw",@progbits;
+1 -1
arch/powerpc/kernel/ucall.S
··· 5 5 * Copyright 2019, IBM Corporation. 6 6 * 7 7 */ 8 + #include <linux/export.h> 8 9 #include <asm/ppc_asm.h> 9 - #include <asm/export.h> 10 10 11 11 _GLOBAL(ucall_norets) 12 12 EXPORT_SYMBOL_GPL(ucall_norets)
+1 -1
arch/powerpc/kernel/vector.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 + #include <linux/export.h> 2 3 #include <linux/linkage.h> 3 4 #include <asm/processor.h> 4 5 #include <asm/ppc_asm.h> ··· 9 8 #include <asm/thread_info.h> 10 9 #include <asm/page.h> 11 10 #include <asm/ptrace.h> 12 - #include <asm/export.h> 13 11 #include <asm/asm-compat.h> 14 12 15 13 /*
+1 -1
arch/powerpc/kvm/book3s_64_entry.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0-only */ 2 + #include <linux/export.h> 2 3 #include <asm/asm-offsets.h> 3 4 #include <asm/cache.h> 4 5 #include <asm/code-patching-asm.h> 5 6 #include <asm/exception-64s.h> 6 - #include <asm/export.h> 7 7 #include <asm/kvm_asm.h> 8 8 #include <asm/kvm_book3s_asm.h> 9 9 #include <asm/mmu.h>
+1 -1
arch/powerpc/kvm/book3s_hv_rmhandlers.S
··· 10 10 * Authors: Alexander Graf <agraf@suse.de> 11 11 */ 12 12 13 + #include <linux/export.h> 13 14 #include <linux/linkage.h> 14 15 #include <linux/objtool.h> 15 16 #include <asm/ppc_asm.h> ··· 25 24 #include <asm/exception-64s.h> 26 25 #include <asm/kvm_book3s_asm.h> 27 26 #include <asm/book3s/64/mmu-hash.h> 28 - #include <asm/export.h> 29 27 #include <asm/tm.h> 30 28 #include <asm/opal.h> 31 29 #include <asm/thread_info.h>
+1 -1
arch/powerpc/kvm/tm.S
··· 6 6 * Copyright 2011 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com> 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <asm/reg.h> 10 11 #include <asm/ppc_asm.h> 11 12 #include <asm/asm-offsets.h> 12 - #include <asm/export.h> 13 13 #include <asm/tm.h> 14 14 #include <asm/cputable.h> 15 15
+1 -1
arch/powerpc/lib/checksum_32.S
··· 8 8 * Severely hacked about by Paul Mackerras (paulus@cs.anu.edu.au). 9 9 */ 10 10 11 + #include <linux/export.h> 11 12 #include <linux/sys.h> 12 13 #include <asm/processor.h> 13 14 #include <asm/cache.h> 14 15 #include <asm/errno.h> 15 16 #include <asm/ppc_asm.h> 16 - #include <asm/export.h> 17 17 18 18 .text 19 19
+1 -1
arch/powerpc/lib/checksum_64.S
··· 8 8 * Severely hacked about by Paul Mackerras (paulus@cs.anu.edu.au). 9 9 */ 10 10 11 + #include <linux/export.h> 11 12 #include <linux/sys.h> 12 13 #include <asm/processor.h> 13 14 #include <asm/errno.h> 14 15 #include <asm/ppc_asm.h> 15 - #include <asm/export.h> 16 16 17 17 /* 18 18 * Computes the checksum of a memory block at buff, length len,
+1 -1
arch/powerpc/lib/copy_32.S
··· 4 4 * 5 5 * Copyright (C) 1996-2005 Paul Mackerras. 6 6 */ 7 + #include <linux/export.h> 7 8 #include <asm/processor.h> 8 9 #include <asm/cache.h> 9 10 #include <asm/errno.h> 10 11 #include <asm/ppc_asm.h> 11 - #include <asm/export.h> 12 12 #include <asm/code-patching-asm.h> 13 13 #include <asm/kasan.h> 14 14
+1 -1
arch/powerpc/lib/copy_mc_64.S
··· 4 4 * Derived from copyuser_power7.s by Anton Blanchard <anton@au.ibm.com> 5 5 * Author - Balbir Singh <bsingharora@gmail.com> 6 6 */ 7 + #include <linux/export.h> 7 8 #include <asm/ppc_asm.h> 8 9 #include <asm/errno.h> 9 - #include <asm/export.h> 10 10 11 11 .macro err1 12 12 100:
+1 -1
arch/powerpc/lib/copypage_64.S
··· 2 2 /* 3 3 * Copyright (C) 2008 Mark Nelson, IBM Corp. 4 4 */ 5 + #include <linux/export.h> 5 6 #include <asm/page.h> 6 7 #include <asm/processor.h> 7 8 #include <asm/ppc_asm.h> 8 9 #include <asm/asm-offsets.h> 9 - #include <asm/export.h> 10 10 #include <asm/feature-fixups.h> 11 11 12 12 _GLOBAL_TOC(copy_page)
+1 -1
arch/powerpc/lib/copyuser_64.S
··· 2 2 /* 3 3 * Copyright (C) 2002 Paul Mackerras, IBM Corp. 4 4 */ 5 + #include <linux/export.h> 5 6 #include <asm/processor.h> 6 7 #include <asm/ppc_asm.h> 7 - #include <asm/export.h> 8 8 #include <asm/asm-compat.h> 9 9 #include <asm/feature-fixups.h> 10 10
+1 -1
arch/powerpc/lib/hweight_64.S
··· 5 5 * 6 6 * Author: Anton Blanchard <anton@au.ibm.com> 7 7 */ 8 + #include <linux/export.h> 8 9 #include <asm/processor.h> 9 10 #include <asm/ppc_asm.h> 10 - #include <asm/export.h> 11 11 #include <asm/feature-fixups.h> 12 12 13 13 /* Note: This code relies on -mminimal-toc */
+1 -1
arch/powerpc/lib/mem_64.S
··· 4 4 * 5 5 * Copyright (C) 1996 Paul Mackerras. 6 6 */ 7 + #include <linux/export.h> 7 8 #include <asm/processor.h> 8 9 #include <asm/errno.h> 9 10 #include <asm/ppc_asm.h> 10 - #include <asm/export.h> 11 11 #include <asm/kasan.h> 12 12 13 13 #ifndef CONFIG_KASAN
+1 -1
arch/powerpc/lib/memcmp_32.S
··· 7 7 * 8 8 */ 9 9 10 + #include <linux/export.h> 10 11 #include <asm/ppc_asm.h> 11 - #include <asm/export.h> 12 12 13 13 .text 14 14
+1 -1
arch/powerpc/lib/memcmp_64.S
··· 3 3 * Author: Anton Blanchard <anton@au.ibm.com> 4 4 * Copyright 2015 IBM Corporation. 5 5 */ 6 + #include <linux/export.h> 6 7 #include <asm/ppc_asm.h> 7 - #include <asm/export.h> 8 8 #include <asm/ppc-opcode.h> 9 9 10 10 #define off8 r6
+1 -1
arch/powerpc/lib/memcpy_64.S
··· 2 2 /* 3 3 * Copyright (C) 2002 Paul Mackerras, IBM Corp. 4 4 */ 5 + #include <linux/export.h> 5 6 #include <asm/processor.h> 6 7 #include <asm/ppc_asm.h> 7 - #include <asm/export.h> 8 8 #include <asm/asm-compat.h> 9 9 #include <asm/feature-fixups.h> 10 10 #include <asm/kasan.h>
+1 -1
arch/powerpc/lib/string.S
··· 4 4 * 5 5 * Copyright (C) 1996 Paul Mackerras. 6 6 */ 7 + #include <linux/export.h> 7 8 #include <asm/ppc_asm.h> 8 - #include <asm/export.h> 9 9 #include <asm/cache.h> 10 10 11 11 .text
+1 -1
arch/powerpc/lib/string_32.S
··· 7 7 * 8 8 */ 9 9 10 + #include <linux/export.h> 10 11 #include <asm/ppc_asm.h> 11 - #include <asm/export.h> 12 12 #include <asm/cache.h> 13 13 14 14 .text
+1 -1
arch/powerpc/lib/string_64.S
··· 6 6 * Author: Anton Blanchard <anton@au.ibm.com> 7 7 */ 8 8 9 + #include <linux/export.h> 9 10 #include <asm/ppc_asm.h> 10 11 #include <asm/linkage.h> 11 12 #include <asm/asm-offsets.h> 12 - #include <asm/export.h> 13 13 14 14 /** 15 15 * __arch_clear_user: - Zero a block of memory in user space, with less checking.
+1 -1
arch/powerpc/lib/strlen_32.S
··· 6 6 * 7 7 * Inspired from glibc implementation 8 8 */ 9 + #include <linux/export.h> 9 10 #include <asm/ppc_asm.h> 10 - #include <asm/export.h> 11 11 #include <asm/cache.h> 12 12 13 13 .text
+1 -1
arch/powerpc/mm/book3s32/hash_low.S
··· 14 14 * hash table, so this file is not used on them.) 15 15 */ 16 16 17 + #include <linux/export.h> 17 18 #include <linux/pgtable.h> 18 19 #include <linux/init.h> 19 20 #include <asm/reg.h> ··· 23 22 #include <asm/ppc_asm.h> 24 23 #include <asm/thread_info.h> 25 24 #include <asm/asm-offsets.h> 26 - #include <asm/export.h> 27 25 #include <asm/feature-fixups.h> 28 26 #include <asm/code-patching-asm.h> 29 27
+1 -1
arch/powerpc/sysdev/dcr-low.S
··· 5 5 * Copyright (c) 2004 Eugene Surovegin <ebs@ebshome.net> 6 6 */ 7 7 8 + #include <linux/export.h> 8 9 #include <asm/ppc_asm.h> 9 10 #include <asm/processor.h> 10 11 #include <asm/bug.h> 11 - #include <asm/export.h> 12 12 13 13 #define DCR_ACCESS_PROLOG(table) \ 14 14 cmplwi cr0,r3,1024; \
tools/testing/selftests/powerpc/copyloops/asm/export.h tools/testing/selftests/powerpc/copyloops/linux/export.h
tools/testing/selftests/powerpc/stringloops/asm/export.h tools/testing/selftests/powerpc/stringloops/linux/export.h