Commit 94ea9c05 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ingo Molnar
Browse files

x86/headers: Replace #include <asm/export.h> with #include <linux/export.h> 



The following commit:

  ddb5cdba ("kbuild: generate KSYMTAB entries by modpost")

deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>.

Use <linux/export.h> in *.S as well as in *.c files.

After all the <asm/export.h> lines are replaced, <asm/export.h> and
<asm-generic/export.h> will be removed.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230806145958.380314-2-masahiroy@kernel.org
parent b425232c

arch/x86/entry/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
 * Common place for both 32- and 64-bit entry routines.

 */



#include <linux/export.h>

#include <linux/linkage.h>

#include <asm/export.h>

#include <asm/msr-index.h>



.pushsection .noinstr.text, "ax"

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * - SYM_FUNC_START/END:Define functions in the symbol table.

 * - idtentry:		Define exception entry points.

 */

#include <linux/export.h>

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/cache.h>
@@ -34,7 +35,6 @@ 
#include <asm/asm.h>

#include <asm/smap.h>

#include <asm/pgtable_types.h>

#include <asm/export.h>

#include <asm/frame.h>

#include <asm/trapnr.h>

#include <asm/nospec-branch.h>

arch/x86/entry/thunk_32.S

+1 −1
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
 * Copyright 2008 by Steven Rostedt, Red Hat, Inc

 *  (inspired by Andi Kleen's thunk_64.S)

 */

	#include <linux/export.h>

	#include <linux/linkage.h>

	#include <asm/asm.h>

	#include <asm/export.h>



	/* put return address in eax (arg1) */

	.macro THUNK name, func, put_ret_addr_in_eax=0

arch/x86/entry/thunk_64.S

+1 −1
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
 * disturbance of register allocation in some inline assembly constructs.

 * Copyright 2001,2002 by Andi Kleen, SuSE Labs.

 */

#include <linux/export.h>

#include <linux/linkage.h>

#include "calling.h"

#include <asm/asm.h>

#include <asm/export.h>



	/* rdi:	arg1 ... normal C conventions. rax is saved/restored. */

	.macro THUNK name, func

arch/x86/kernel/ftrace_32.S

+1 −1
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
 *  Copyright (C) 2017  Steven Rostedt, VMware Inc.

 */



#include <linux/export.h>

#include <linux/linkage.h>

#include <asm/page_types.h>

#include <asm/segment.h>

#include <asm/export.h>

#include <asm/ftrace.h>

#include <asm/nospec-branch.h>

#include <asm/frame.h>