powerpc: 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>
[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
This commit is contained in:
parent
3eb3f168e8
commit
3932618287
@ -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() */
|
||||
|
@ -9,6 +9,7 @@
|
||||
* Copyright (C) 1997 Dan Malek (dmalek@jlc.net).
|
||||
*/
|
||||
|
||||
#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>
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -9,6 +9,7 @@
|
||||
* PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)
|
||||
*/
|
||||
|
||||
#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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
||||
/*
|
||||
|
@ -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>
|
||||
|
@ -10,6 +10,7 @@
|
||||
* Authors: Alexander Graf <agraf@suse.de>
|
||||
*/
|
||||
|
||||
#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>
|
||||
|
@ -6,10 +6,10 @@
|
||||
* Copyright 2011 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
|
||||
*/
|
||||
|
||||
#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>
|
||||
|
||||
|
@ -8,12 +8,12 @@
|
||||
* Severely hacked about by Paul Mackerras (paulus@cs.anu.edu.au).
|
||||
*/
|
||||
|
||||
#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
|
||||
|
||||
|
@ -8,11 +8,11 @@
|
||||
* Severely hacked about by Paul Mackerras (paulus@cs.anu.edu.au).
|
||||
*/
|
||||
|
||||
#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,
|
||||
|
@ -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>
|
||||
|
||||
|
@ -4,9 +4,9 @@
|
||||
* Derived from copyuser_power7.s by Anton Blanchard <anton@au.ibm.com>
|
||||
* Author - Balbir Singh <bsingharora@gmail.com>
|
||||
*/
|
||||
#include <linux/export.h>
|
||||
#include <asm/ppc_asm.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/export.h>
|
||||
|
||||
.macro err1
|
||||
100:
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
||||
|
@ -5,9 +5,9 @@
|
||||
*
|
||||
* Author: Anton Blanchard <anton@au.ibm.com>
|
||||
*/
|
||||
#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 */
|
||||
|
@ -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
|
||||
|
@ -7,8 +7,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <asm/ppc_asm.h>
|
||||
#include <asm/export.h>
|
||||
|
||||
.text
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
* Author: Anton Blanchard <anton@au.ibm.com>
|
||||
* 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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -7,8 +7,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/export.h>
|
||||
#include <asm/ppc_asm.h>
|
||||
#include <asm/export.h>
|
||||
#include <asm/cache.h>
|
||||
|
||||
.text
|
||||
|
@ -6,10 +6,10 @@
|
||||
* Author: Anton Blanchard <anton@au.ibm.com>
|
||||
*/
|
||||
|
||||
#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.
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -5,10 +5,10 @@
|
||||
* Copyright (c) 2004 Eugene Surovegin <ebs@ebshome.net>
|
||||
*/
|
||||
|
||||
#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; \
|
||||
|
Loading…
Reference in New Issue
Block a user