Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace <asm/export.h> uses with <linux/export.h> and then remove <asm/export.h>.

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmU9DyYRHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1iZqQ/+MZif5+F024nXciPOeogsMxtT5zStTd9a
 D+rBOCg6iodBIKKcfoqWUkjwXiREwnMxLq9JbArWIqOIBEEfMUsxz7S7PsnFA5dS
 /wXtJ6LHxiudeW6Vs41zLpJVANeAwxFXXyGGuRFk3Hxb7Zwh5jwhU76PKfBiUxrh
 7PzAqfOcVcbvlMXD/oMn9PlhRA4U+nrz+4ao00NCrbWBH/+ECHLb24IoB39jV8Gb
 XMDSsS5vxmCAR+ObRZm209lEf+tIv0T4I57GF85i5fX2aOrwPVvJDtnNMZY8xBDh
 TOyrq+JUTrl6JDKsRfiqvwxIG52bvytK0RHGfzUfObVtVa1AqlXwZaOUYItxlVjx
 f99DkIKhdUV6B3fVvYjsVP+g551kFKbh4EzYnLyp9XlMDIW9WVJv6u4GhR84piju
 3gxkYYBqnD58d/sf3xlAm5NDiqm2vGqw6qWKPkw7HrhX9QGaVkqIKMZTGVk2zM95
 LPVtXfqM+D3nscOmzoD9IsWmi7Z5ep8O0OfM0plOTRLYUlON2F5ewi4l0dNURH1g
 xHO3kr/TpzKeyv2NsG3ugqcO1evItJuCDx/PdzpR88HML/aXSeBh6IlEpMEnXQeq
 wQqB3YpgpTpV0/onIKfRs9qI4posWg0z0Rnfpp+nvVAjpsNrvndddZr65p5lkynZ
 9ccJQ7ipaw0=
 =O8Ce
 -----END PGP SIGNATURE-----

Merge tag 'x86-headers-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 header file cleanup from Ingo Molnar:
 "Replace <asm/export.h> uses with <linux/export.h> and then remove
  <asm/export.h>"

* tag 'x86-headers-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/headers: Remove <asm/export.h>
  x86/headers: Replace #include <asm/export.h> with #include <linux/export.h>
  x86/headers: Remove unnecessary #include <asm/export.h>
This commit is contained in:
Linus Torvalds 2023-10-30 14:04:23 -10:00
commit 3b8b4b4fc4
25 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/entry/entry.S
View File

@ -3,8 +3,8 @@
* Common place for both 32- and 64-bit entry routines. * Common place for both 32- and 64-bit entry routines.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
#include <asm/msr-index.h> #include <asm/msr-index.h>
.pushsection .noinstr.text, "ax" .pushsection .noinstr.text, "ax"

2
arch/x86/entry/entry_64.S
View File

@ -18,6 +18,7 @@
* - SYM_FUNC_START/END:Define functions in the symbol table. * - SYM_FUNC_START/END:Define functions in the symbol table.
* - idtentry: Define exception entry points. * - idtentry: Define exception entry points.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/cache.h> #include <asm/cache.h>
@ -34,7 +35,6 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/smap.h> #include <asm/smap.h>
#include <asm/pgtable_types.h> #include <asm/pgtable_types.h>
#include <asm/export.h>
#include <asm/frame.h> #include <asm/frame.h>
#include <asm/trapnr.h> #include <asm/trapnr.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>

2
arch/x86/entry/thunk_32.S
View File

@ -4,9 +4,9 @@
* Copyright 2008 by Steven Rostedt, Red Hat, Inc * Copyright 2008 by Steven Rostedt, Red Hat, Inc
* (inspired by Andi Kleen's thunk_64.S) * (inspired by Andi Kleen's thunk_64.S)
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
/* put return address in eax (arg1) */ /* put return address in eax (arg1) */
.macro THUNK name, func, put_ret_addr_in_eax=0 .macro THUNK name, func, put_ret_addr_in_eax=0

2
arch/x86/entry/thunk_64.S
View File

@ -4,10 +4,10 @@
* disturbance of register allocation in some inline assembly constructs. * disturbance of register allocation in some inline assembly constructs.
* Copyright 2001,2002 by Andi Kleen, SuSE Labs. * Copyright 2001,2002 by Andi Kleen, SuSE Labs.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include "calling.h" #include "calling.h"
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */ /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
.macro THUNK name, func .macro THUNK name, func

1
arch/x86/entry/vdso/vsgx.S
View File

@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/enclu.h> #include <asm/enclu.h>

1
arch/x86/include/asm/Kbuild
View File

@ -10,5 +10,4 @@ generated-y += unistd_64_x32.h
generated-y += xen-hypercalls.h generated-y += xen-hypercalls.h
generic-y += early_ioremap.h generic-y += early_ioremap.h
generic-y += export.h
generic-y += mcs_spinlock.h generic-y += mcs_spinlock.h

2
arch/x86/kernel/ftrace_32.S
View File

@ -3,10 +3,10 @@
* Copyright (C) 2017 Steven Rostedt, VMware Inc. * Copyright (C) 2017 Steven Rostedt, VMware Inc.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/page_types.h> #include <asm/page_types.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/export.h>
#include <asm/ftrace.h> #include <asm/ftrace.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
#include <asm/frame.h> #include <asm/frame.h>

2
arch/x86/kernel/ftrace_64.S
View File

@ -3,12 +3,12 @@
* Copyright (C) 2014 Steven Rostedt, Red Hat Inc * Copyright (C) 2014 Steven Rostedt, Red Hat Inc
*/ */
#include <linux/export.h>
#include <linux/cfi_types.h> #include <linux/cfi_types.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/ftrace.h> #include <asm/ftrace.h>
#include <asm/export.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
#include <asm/unwind_hints.h> #include <asm/unwind_hints.h>
#include <asm/frame.h> #include <asm/frame.h>

2
arch/x86/kernel/head_32.S
View File

@ -8,6 +8,7 @@
*/ */
.text .text
#include <linux/export.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/linkage.h> #include <linux/linkage.h>
@ -25,7 +26,6 @@
#include <asm/nops.h> #include <asm/nops.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
#include <asm/bootparam.h> #include <asm/bootparam.h>
#include <asm/export.h>
#include <asm/pgtable_32.h> #include <asm/pgtable_32.h>
/* Physical address */ /* Physical address */

3
arch/x86/kernel/head_64.S
View File

@ -9,7 +9,7 @@
* Copyright (C) 2005 Eric Biederman <ebiederm@xmission.com> * Copyright (C) 2005 Eric Biederman <ebiederm@xmission.com>
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/init.h> #include <linux/init.h>
@ -22,7 +22,6 @@
#include <asm/percpu.h> #include <asm/percpu.h>
#include <asm/nops.h> #include <asm/nops.h>
#include "../entry/calling.h" #include "../entry/calling.h"
#include <asm/export.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
#include <asm/apicdef.h> #include <asm/apicdef.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>

2
arch/x86/kernel/irqflags.S
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h> #include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
/* /*

2
arch/x86/lib/checksum_32.S
View File

@ -21,10 +21,10 @@
* converted to pure assembler * converted to pure assembler
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
/* /*

2
arch/x86/lib/clear_page_64.S
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
/* /*
* Most CPUs support enhanced REP MOVSB/STOSB instructions. It is * Most CPUs support enhanced REP MOVSB/STOSB instructions. It is

2
arch/x86/lib/cmpxchg8b_emu.S
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
#include <asm/percpu.h> #include <asm/percpu.h>
#include <asm/processor-flags.h> #include <asm/processor-flags.h>

2
arch/x86/lib/copy_page_64.S
View File

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Written 2003 by Andi Kleen, based on a kernel by Evandro Menezes */ /* Written 2003 by Andi Kleen, based on a kernel by Evandro Menezes */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/export.h>
/* /*
* Some CPUs run faster using the string copy instructions (sane microcode). * Some CPUs run faster using the string copy instructions (sane microcode).

2
arch/x86/lib/copy_user_64.S
View File

@ -6,11 +6,11 @@
* Functions to copy from and to user space. * Functions to copy from and to user space.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
/* /*
* rep_movs_alternative - memory copy with exception handling. * rep_movs_alternative - memory copy with exception handling.

2
arch/x86/lib/copy_user_uncached_64.S
View File

@ -3,9 +3,9 @@
* Copyright 2023 Linus Torvalds <torvalds@linux-foundation.org> * Copyright 2023 Linus Torvalds <torvalds@linux-foundation.org>
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/export.h>
/* /*
* copy_user_nocache - Uncached memory copy with exception handling * copy_user_nocache - Uncached memory copy with exception handling

2
arch/x86/lib/getuser.S
View File

@ -26,6 +26,7 @@
* as they get called from within inline assembly. * as they get called from within inline assembly.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/page_types.h> #include <asm/page_types.h>
#include <asm/errno.h> #include <asm/errno.h>
@ -33,7 +34,6 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/smap.h> #include <asm/smap.h>
#include <asm/export.h>
#define ASM_BARRIER_NOSPEC ALTERNATIVE "", "lfence", X86_FEATURE_LFENCE_RDTSC #define ASM_BARRIER_NOSPEC ALTERNATIVE "", "lfence", X86_FEATURE_LFENCE_RDTSC

2
arch/x86/lib/hweight.S
View File

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
#include <asm/asm.h> #include <asm/asm.h>

2
arch/x86/lib/memcpy_64.S
View File

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright 2002 Andi Kleen */ /* Copyright 2002 Andi Kleen */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/cfi_types.h> #include <linux/cfi_types.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/export.h>
.section .noinstr.text, "ax" .section .noinstr.text, "ax"

2
arch/x86/lib/memmove_32.S
View File

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/export.h>
SYM_FUNC_START(memmove) SYM_FUNC_START(memmove)
/* /*

2
arch/x86/lib/memmove_64.S
View File

@ -6,10 +6,10 @@
* This assembly file is re-written from memmove_64.c file. * This assembly file is re-written from memmove_64.c file.
* - Copyright 2011 Fenghua Yu <fenghua.yu@intel.com> * - Copyright 2011 Fenghua Yu <fenghua.yu@intel.com>
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/export.h>
#undef memmove #undef memmove

2
arch/x86/lib/memset_64.S
View File

@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* Copyright 2002 Andi Kleen, SuSE Labs */ /* Copyright 2002 Andi Kleen, SuSE Labs */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/export.h>
.section .noinstr.text, "ax" .section .noinstr.text, "ax"

3
arch/x86/lib/putuser.S
View File

@ -11,13 +11,12 @@
* return an error value in addition to the "real" * return an error value in addition to the "real"
* return value. * return value.
*/ */
#include <linux/export.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/smap.h> #include <asm/smap.h>
#include <asm/export.h>
/* /*
* __put_user_X * __put_user_X

2
arch/x86/lib/retpoline.S
View File

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#include <linux/export.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/dwarf2.h> #include <asm/dwarf2.h>
#include <asm/cpufeatures.h> #include <asm/cpufeatures.h>
#include <asm/alternative.h> #include <asm/alternative.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/export.h>
#include <asm/nospec-branch.h> #include <asm/nospec-branch.h>
#include <asm/unwind_hints.h> #include <asm/unwind_hints.h>
#include <asm/percpu.h> #include <asm/percpu.h>