x86: Clean up ia32_unistd.h
Subsystems (2)
cover x86: Clean up ia32_unistd.h
Other than one unused macro, ia32_unistd.h is just a wrapper for unistd_32_ia32.h, and can be removed.
Brian Gerst (2):
x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR x86/syscall/compat: Remove ia32_unistd.h
arch/x86/entry/entry_64_compat.S | 1 - arch/x86/include/asm/ia32_unistd.h | 12 ------------ arch/x86/include/asm/seccomp.h | 2 +- arch/x86/kernel/signal_32.c | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 arch/x86/include/asm/ia32_unistd.h
Signature · 1 line
2.40.1
PATCH 1/2 x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
Signed-off-by Brian Gerst <[email protected]>
--- arch/x86/include/asm/ia32_unistd.h | 1 - 1 file changed, 1 deletion(-)
arch/x86/include/asm/ia32_unistd.h +0 -1
@@ -6,7 +6,6 @@* This file contains the system call numbers of the ia32 compat ABI, * this is for the kernel only. */ -#define __SYSCALL_ia32_NR (x) (x)#include <asm/unistd_32_ia32.h> #endif /* _ASM_X86_IA32_UNISTD_H */
Signature · 1 line
2.40.1
PATCH 2/2 x86/syscall/compat: Remove ia32_unistd.h
In reply to Brian GerstThis header is now just a wrapper for unistd_32_ia32.h.
Signed-off-by Brian Gerst <[email protected]>
--- arch/x86/entry/entry_64_compat.S | 1 - arch/x86/include/asm/ia32_unistd.h | 11 ----------- arch/x86/include/asm/seccomp.h | 2 +- arch/x86/kernel/signal_32.c | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 arch/x86/include/asm/ia32_unistd.h
arch/x86/entry/entry_64_compat.S +0 -1
@@ -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>
arch/x86/include/asm/ia32_unistd.h deleted +0 -11
@@ -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 */
arch/x86/include/asm/seccomp.h +1 -1
@@ -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
arch/x86/kernel/signal_32.c +1 -1
@@ -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) {
Signature · 1 line
2.40.1
Brian!
Quoted 6 lines · Brian Gerst
Other than one unused macro,
ia32_unistd.his just a wrapper forunistd_32_ia32.h, and can be removed.Brian Gerst (2):
x86/syscall/compat: Remove unused macro__SYSCALL_ia32_NRx86/syscall/compat: Removeia32_unistd.h
Reviewed-by Thomas Gleixner <[email protected]>
Thanks a lot for doing this (thankless) cleanup work!
tglx