diff options
| author | Brian Gerst <brgerst@gmail.com> | 2024-03-21 17:18:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-03-22 09:37:09 +0100 |
| commit | e2d168328e3bdd21efa2ba34392f620ce58d2914 (patch) | |
| tree | f41f4e772cfbe05e4da63d530932ad72d43878b5 /arch | |
| parent | 9342164635f86eefbe01258fcfb597945e7ab5a4 (diff) | |
| download | linux-stable-e2d168328e3bdd21efa2ba34392f620ce58d2914.tar.gz linux-stable-e2d168328e3bdd21efa2ba34392f620ce58d2914.tar.bz2 linux-stable-e2d168328e3bdd21efa2ba34392f620ce58d2914.zip | |
x86/syscall/compat: Remove ia32_unistd.h
This header is now just a wrapper for unistd_32_ia32.h.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240321211847.132473-3-brgerst@gmail.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/entry/entry_64_compat.S | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/ia32_unistd.h | 11 | ||||
| -rw-r--r-- | arch/x86/include/asm/seccomp.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/signal_32.c | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index eabf48c4d4b4..49cc4b8cfbb5 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -7,7 +7,6 @@ #include <asm/asm-offsets.h> #include <asm/current.h> #include <asm/errno.h> -#include <asm/ia32_unistd.h> #include <asm/thread_info.h> #include <asm/segment.h> #include <asm/irqflags.h> diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h deleted file mode 100644 index 7bcb82951c11..000000000000 --- a/arch/x86/include/asm/ia32_unistd.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_IA32_UNISTD_H -#define _ASM_X86_IA32_UNISTD_H - -/* - * This file contains the system call numbers of the ia32 compat ABI, - * this is for the kernel only. - */ -#include <asm/unistd_32_ia32.h> - -#endif /* _ASM_X86_IA32_UNISTD_H */ diff --git a/arch/x86/include/asm/seccomp.h b/arch/x86/include/asm/seccomp.h index fef16e398161..42bcd42d70d1 100644 --- a/arch/x86/include/asm/seccomp.h +++ b/arch/x86/include/asm/seccomp.h @@ -9,7 +9,7 @@ #endif #ifdef CONFIG_COMPAT -#include <asm/ia32_unistd.h> +#include <asm/unistd_32_ia32.h> #define __NR_seccomp_read_32 __NR_ia32_read #define __NR_seccomp_write_32 __NR_ia32_write #define __NR_seccomp_exit_32 __NR_ia32_exit diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index c12624bc82a3..ef654530bf5a 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -34,7 +34,7 @@ #include <asm/gsseg.h> #ifdef CONFIG_IA32_EMULATION -#include <asm/ia32_unistd.h> +#include <asm/unistd_32_ia32.h> static inline void reload_segments(struct sigcontext_32 *sc) { |