powerpc: remove unneeded #include <asm/export.h>
Subsystems (4)
PATCH 1/3 powerpc: remove unneeded #include <asm/export.h>
There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> is unneeded.
---
arch/powerpc/kernel/entry_32.S | 1 - arch/powerpc/kernel/head_40x.S | 1 - arch/powerpc/kernel/head_44x.S | 1 - arch/powerpc/kernel/head_64.S | 1 - arch/powerpc/kernel/head_85xx.S | 1 - arch/powerpc/kernel/head_8xx.S | 1 - arch/powerpc/kernel/head_book3s_32.S | 1 - arch/powerpc/kernel/trace/ftrace_64_pg.S | 1 - arch/powerpc/kernel/trace/ftrace_mprofile.S | 1 - 9 files changed, 9 deletions(-)
arch/powerpc/kernel/entry_32.S +0 -1
@@ -29,7 +29,6 @@ #include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #include <asm/barrier.h> #include <asm/kup.h>
arch/powerpc/kernel/head_40x.S +0 -1
@@ -38,7 +38,6 @@ #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/export.h> #include "head_32.h"
arch/powerpc/kernel/head_44x.S +0 -1
@@ -35,7 +35,6 @@ #include <asm/asm-offsets.h> #include <asm/ptrace.h> #include <asm/synch.h> -#include <asm/export.h> #include <asm/code-patching-asm.h> #include "head_booke.h"
arch/powerpc/kernel/head_64.S +0 -1
@@ -40,7 +40,6 @@ #include <asm/hw_irq.h> #include <asm/cputhreads.h> #include <asm/ppc-opcode.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #ifdef CONFIG_PPC_BOOK3S #include <asm/exception-64s.h>
arch/powerpc/kernel/head_85xx.S +0 -1
@@ -40,7 +40,6 @@ #include <asm/asm-offsets.h> #include <asm/cache.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #include "head_booke.h"
arch/powerpc/kernel/head_8xx.S +0 -1
@@ -29,7 +29,6 @@ #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/code-patching-asm.h> #include <asm/interrupt.h>
arch/powerpc/kernel/head_book3s_32.S +0 -1
@@ -31,7 +31,6 @@ #include <asm/ptrace.h> #include <asm/bug.h> #include <asm/kvm_book3s_asm.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #include <asm/interrupt.h>
arch/powerpc/kernel/trace/ftrace_64_pg.S +0 -1
@@ -8,7 +8,6 @@ #include <asm/asm-offsets.h> #include <asm/ftrace.h> #include <asm/ppc-opcode.h> -#include <asm/export.h> _GLOBAL_TOC(ftrace_caller) lbz r3, PACA_FTRACE_ENABLED(r13)
arch/powerpc/kernel/trace/ftrace_mprofile.S +0 -1
@@ -8,7 +8,6 @@ #include <asm/asm-offsets.h> #include <asm/ftrace.h> #include <asm/ppc-opcode.h> -#include <asm/export.h> #include <asm/thread_info.h> #include <asm/bug.h> #include <asm/ptrace.h>
Signature · 1 line
2.39.2
PATCH 2/3 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.
---
arch/powerpc/kernel/epapr_hcalls.S | 2 +- arch/powerpc/kernel/fpu.S | 2 +- arch/powerpc/kernel/misc.S | 2 +- arch/powerpc/kernel/misc_32.S | 2 +- arch/powerpc/kernel/misc_64.S | 2 +- arch/powerpc/kernel/tm.S | 2 +- arch/powerpc/kernel/trace/ftrace_low.S | 2 +- arch/powerpc/kernel/ucall.S | 2 +- arch/powerpc/kernel/vector.S | 2 +- arch/powerpc/kvm/book3s_64_entry.S | 2 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +- arch/powerpc/kvm/tm.S | 2 +- arch/powerpc/lib/checksum_32.S | 2 +- arch/powerpc/lib/checksum_64.S | 2 +- arch/powerpc/lib/copy_32.S | 2 +- arch/powerpc/lib/copy_mc_64.S | 2 +- arch/powerpc/lib/copypage_64.S | 2 +- arch/powerpc/lib/copyuser_64.S | 2 +- arch/powerpc/lib/hweight_64.S | 2 +- arch/powerpc/lib/mem_64.S | 2 +- arch/powerpc/lib/memcmp_32.S | 2 +- arch/powerpc/lib/memcmp_64.S | 2 +- arch/powerpc/lib/memcpy_64.S | 2 +- arch/powerpc/lib/string.S | 2 +- arch/powerpc/lib/string_32.S | 2 +- arch/powerpc/lib/string_64.S | 2 +- arch/powerpc/lib/strlen_32.S | 2 +- arch/powerpc/mm/book3s32/hash_low.S | 2 +- arch/powerpc/sysdev/dcr-low.S | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-)
arch/powerpc/kernel/epapr_hcalls.S +1 -1
@@ -3,6 +3,7 @@ * Copyright (C) 2012 Freescale Semiconductor, Inc. */ +#include <linux/export.h> #include <linux/threads.h> #include <asm/epapr_hcalls.h> #include <asm/reg.h>
@@ -12,7 +13,6 @@ #include <asm/ppc_asm.h> #include <asm/asm-compat.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #ifndef CONFIG_PPC64 /* epapr_ev_idle() was derived from e500_idle() */
arch/powerpc/kernel/fpu.S +1 -1
@@ -9,6 +9,7 @@ * Copyright (C) 1997 Dan Malek ([email protected]). */ +#include <linux/export.h> #include <asm/reg.h> #include <asm/page.h> #include <asm/mmu.h>
@@ -18,7 +19,6 @@ #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/asm-compat.h> #include <asm/feature-fixups.h>
arch/powerpc/kernel/misc.S +1 -1
@@ -10,11 +10,11 @@ * * setjmp/longjmp code by Paul Mackerras. */ +#include <linux/export.h> #include <asm/ppc_asm.h> #include <asm/unistd.h> #include <asm/asm-compat.h> #include <asm/asm-offsets.h> -#include <asm/export.h> .text
arch/powerpc/kernel/misc_32.S +1 -1
@@ -8,6 +8,7 @@ * */ +#include <linux/export.h> #include <linux/sys.h> #include <asm/unistd.h> #include <asm/errno.h>
@@ -22,7 +23,6 @@ #include <asm/processor.h> #include <asm/bug.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/feature-fixups.h> .text
arch/powerpc/kernel/misc_64.S +1 -1
@@ -9,6 +9,7 @@ * PPC64 updates by Dave Engebretsen ([email protected]) */ +#include <linux/export.h> #include <linux/linkage.h> #include <linux/sys.h> #include <asm/unistd.h>
@@ -23,7 +24,6 @@ #include <asm/kexec.h> #include <asm/ptrace.h> #include <asm/mmu.h> -#include <asm/export.h> #include <asm/feature-fixups.h> .text
arch/powerpc/kernel/tm.S +1 -1
@@ -6,13 +6,13 @@ * Copyright 2012 Matt Evans & Michael Neuling, IBM Corporation. */ +#include <linux/export.h> #include <asm/asm-offsets.h> #include <asm/ppc_asm.h> #include <asm/ppc-opcode.h> #include <asm/ptrace.h> #include <asm/reg.h> #include <asm/bug.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #ifdef CONFIG_VSX
arch/powerpc/kernel/trace/ftrace_low.S +1 -1
@@ -3,12 +3,12 @@ * Split from entry_64.S */ +#include <linux/export.h> #include <linux/magic.h> #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/ftrace.h> #include <asm/ppc-opcode.h> -#include <asm/export.h> #ifdef CONFIG_PPC64 .pushsection ".tramp.ftrace.text","aw",@progbits;
arch/powerpc/kernel/ucall.S +1 -1
@@ -5,8 +5,8 @@ * Copyright 2019, IBM Corporation. * */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> _GLOBAL(ucall_norets) EXPORT_SYMBOL_GPL(ucall_norets)
arch/powerpc/kernel/vector.S +1 -1
@@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/processor.h> #include <asm/ppc_asm.h>
@@ -8,7 +9,6 @@ #include <asm/thread_info.h> #include <asm/page.h> #include <asm/ptrace.h> -#include <asm/export.h> #include <asm/asm-compat.h> /*
arch/powerpc/kvm/book3s_64_entry.S +1 -1
@@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <linux/export.h> #include <asm/asm-offsets.h> #include <asm/cache.h> #include <asm/code-patching-asm.h> #include <asm/exception-64s.h> -#include <asm/export.h> #include <asm/kvm_asm.h> #include <asm/kvm_book3s_asm.h> #include <asm/mmu.h>
arch/powerpc/kvm/book3s_hv_rmhandlers.S +1 -1
@@ -10,6 +10,7 @@ * Authors: Alexander Graf <[email protected]> */ +#include <linux/export.h> #include <linux/linkage.h> #include <linux/objtool.h> #include <asm/ppc_asm.h>
@@ -24,7 +25,6 @@ #include <asm/exception-64s.h> #include <asm/kvm_book3s_asm.h> #include <asm/book3s/64/mmu-hash.h> -#include <asm/export.h> #include <asm/tm.h> #include <asm/opal.h> #include <asm/thread_info.h>
arch/powerpc/kvm/tm.S +1 -1
@@ -6,10 +6,10 @@ * Copyright 2011 Paul Mackerras, IBM Corp. <[email protected]> */ +#include <linux/export.h> #include <asm/reg.h> #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/tm.h> #include <asm/cputable.h>
arch/powerpc/lib/checksum_32.S +1 -1
@@ -8,12 +8,12 @@ * Severely hacked about by Paul Mackerras ([email protected]). */ +#include <linux/export.h> #include <linux/sys.h> #include <asm/processor.h> #include <asm/cache.h> #include <asm/errno.h> #include <asm/ppc_asm.h> -#include <asm/export.h> .text
arch/powerpc/lib/checksum_64.S +1 -1
@@ -8,11 +8,11 @@ * Severely hacked about by Paul Mackerras ([email protected]). */ +#include <linux/export.h> #include <linux/sys.h> #include <asm/processor.h> #include <asm/errno.h> #include <asm/ppc_asm.h> -#include <asm/export.h> /* * Computes the checksum of a memory block at buff, length len,
arch/powerpc/lib/copy_32.S +1 -1
@@ -4,11 +4,11 @@ * * Copyright (C) 1996-2005 Paul Mackerras. */ +#include <linux/export.h> #include <asm/processor.h> #include <asm/cache.h> #include <asm/errno.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/code-patching-asm.h> #include <asm/kasan.h>
arch/powerpc/lib/copy_mc_64.S +1 -1
@@ -4,9 +4,9 @@ * Derived from copyuser_power7.s by Anton Blanchard <[email protected]> * Author - Balbir Singh <[email protected]> */ +#include <linux/export.h> #include <asm/ppc_asm.h> #include <asm/errno.h> -#include <asm/export.h> .macro err1 100:
arch/powerpc/lib/copypage_64.S +1 -1
@@ -2,11 +2,11 @@ /* * Copyright (C) 2008 Mark Nelson, IBM Corp. */ +#include <linux/export.h> #include <asm/page.h> #include <asm/processor.h> #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/feature-fixups.h> _GLOBAL_TOC(copy_page)
arch/powerpc/lib/copyuser_64.S +1 -1
@@ -2,9 +2,9 @@ /* * Copyright (C) 2002 Paul Mackerras, IBM Corp. */ +#include <linux/export.h> #include <asm/processor.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/asm-compat.h> #include <asm/feature-fixups.h>
arch/powerpc/lib/hweight_64.S +1 -1
@@ -5,9 +5,9 @@ * * Author: Anton Blanchard <[email protected]> */ +#include <linux/export.h> #include <asm/processor.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/feature-fixups.h> /* Note: This code relies on -mminimal-toc */
arch/powerpc/lib/mem_64.S +1 -1
@@ -4,10 +4,10 @@ * * Copyright (C) 1996 Paul Mackerras. */ +#include <linux/export.h> #include <asm/processor.h> #include <asm/errno.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/kasan.h> #ifndef CONFIG_KASAN
arch/powerpc/lib/memcmp_32.S +1 -1
@@ -7,8 +7,8 @@ * */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> .text
arch/powerpc/lib/memcmp_64.S +1 -1
@@ -3,8 +3,8 @@ * Author: Anton Blanchard <[email protected]> * Copyright 2015 IBM Corporation. */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/ppc-opcode.h> #define off8 r6
arch/powerpc/lib/memcpy_64.S +1 -1
@@ -2,9 +2,9 @@ /* * Copyright (C) 2002 Paul Mackerras, IBM Corp. */ +#include <linux/export.h> #include <asm/processor.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/asm-compat.h> #include <asm/feature-fixups.h> #include <asm/kasan.h>
arch/powerpc/lib/string.S +1 -1
@@ -4,8 +4,8 @@ * * Copyright (C) 1996 Paul Mackerras. */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/cache.h> .text
arch/powerpc/lib/string_32.S +1 -1
@@ -7,8 +7,8 @@ * */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/cache.h> .text
arch/powerpc/lib/string_64.S +1 -1
@@ -6,10 +6,10 @@ * Author: Anton Blanchard <[email protected]> */ +#include <linux/export.h> #include <asm/ppc_asm.h> #include <asm/linkage.h> #include <asm/asm-offsets.h> -#include <asm/export.h> /** * __arch_clear_user: - Zero a block of memory in user space, with less checking.
arch/powerpc/lib/strlen_32.S +1 -1
@@ -6,8 +6,8 @@ * * Inspired from glibc implementation */ +#include <linux/export.h> #include <asm/ppc_asm.h> -#include <asm/export.h> #include <asm/cache.h> .text
arch/powerpc/mm/book3s32/hash_low.S +1 -1
@@ -14,6 +14,7 @@ * hash table, so this file is not used on them.) */ +#include <linux/export.h> #include <linux/pgtable.h> #include <linux/init.h> #include <asm/reg.h>
@@ -22,7 +23,6 @@ #include <asm/ppc_asm.h> #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#include <asm/export.h> #include <asm/feature-fixups.h> #include <asm/code-patching-asm.h>
arch/powerpc/sysdev/dcr-low.S +1 -1
@@ -5,10 +5,10 @@ * Copyright (c) 2004 Eugene Surovegin <[email protected]> */ +#include <linux/export.h> #include <asm/ppc_asm.h> #include <asm/processor.h> #include <asm/bug.h> -#include <asm/export.h> #define DCR_ACCESS_PROLOG(table) \ cmplwi cr0,r3,1024; \
Signature · 1 line
2.39.2
PATCH 3/3 powerpc: remove <asm/export.h>
In reply to Masahiro YamadaAll *.S files under arch/powerpc/ have been converted to include <linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
---
arch/powerpc/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/include/asm/Kbuild +0 -1
@@ -3,7 +3,6 @@ generated-y += syscall_table_32.h generated-y += syscall_table_64.h generated-y += syscall_table_spu.h generic-y += agp.h -generic-y += export.h generic-y += kvm_types.h generic-y += mcs_spinlock.h generic-y += qrwlock.h
Signature · 1 line
2.39.2
Michael Ellerman
AppliedQuoted 4 lines · Masahiro Yamada
There is no
EXPORT_SYMBOLline there, hence #include <asm/export.h> is unneeded.
Applied to powerpc/next.
[1/3] powerpc: remove unneeded #include <asm/export.h>
https://git.kernel.org/powerpc/c/3eb3f168e83aa7a7b8477507cf4b08b9515b4b13 [2/3] powerpc: replace #include <asm/export.h> with #include <linux/export.h> https://git.kernel.org/powerpc/c/393261828740c3ed95fc810c3f4c1018b86af7e5 [3/3] powerpc: remove <asm/export.h> https://git.kernel.org/powerpc/c/efa1f85019537ce44832cf73a6db18611e3e41cd
cheers