* [PATCH 0/2] x86: Remove ia32_unistd.h
@ 2024-03-21 21:18 Brian Gerst
2024-03-21 21:18 ` [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Brian Gerst
2024-03-21 21:18 ` [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h Brian Gerst
0 siblings, 2 replies; 6+ messages in thread
From: Brian Gerst @ 2024-03-21 21:18 UTC (permalink / raw)
To: linux-kernel, x86
Cc: Ingo Molnar, Thomas Gleixner, Borislav Petkov, H . Peter Anvin,
Brian Gerst
Besides containing one unused macro, ia32_unistd.h is simply a leftover
wrapper for unistd_32_ia32.h. Remove it.
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
base-commit: 93387dba36cc9033724d8b874a5cf6779ef084ab
--
2.44.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
2024-03-21 21:18 [PATCH 0/2] x86: Remove ia32_unistd.h Brian Gerst
@ 2024-03-21 21:18 ` Brian Gerst
2024-03-22 8:48 ` [tip: x86/cleanups] " tip-bot2 for Brian Gerst
2024-03-21 21:18 ` [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h Brian Gerst
1 sibling, 1 reply; 6+ messages in thread
From: Brian Gerst @ 2024-03-21 21:18 UTC (permalink / raw)
To: linux-kernel, x86
Cc: Ingo Molnar, Thomas Gleixner, Borislav Petkov, H . Peter Anvin,
Brian Gerst
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/ia32_unistd.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
index aa065c94ccf5..7bcb82951c11 100644
--- a/arch/x86/include/asm/ia32_unistd.h
+++ b/arch/x86/include/asm/ia32_unistd.h
@@ -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 */
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h
2024-03-21 21:18 [PATCH 0/2] x86: Remove ia32_unistd.h Brian Gerst
2024-03-21 21:18 ` [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Brian Gerst
@ 2024-03-21 21:18 ` Brian Gerst
2024-03-22 8:48 ` [tip: x86/cleanups] " tip-bot2 for Brian Gerst
1 sibling, 1 reply; 6+ messages in thread
From: Brian Gerst @ 2024-03-21 21:18 UTC (permalink / raw)
To: linux-kernel, x86
Cc: Ingo Molnar, Thomas Gleixner, Borislav Petkov, H . Peter Anvin,
Brian Gerst
This header is now just a wrapper for unistd_32_ia32.h.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
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
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)
{
--
2.44.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: x86/cleanups] x86/syscall/compat: Remove ia32_unistd.h
2024-03-21 21:18 ` [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h Brian Gerst
@ 2024-03-22 8:48 ` tip-bot2 for Brian Gerst
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Brian Gerst @ 2024-03-22 8:48 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Brian Gerst, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: e2d168328e3bdd21efa2ba34392f620ce58d2914
Gitweb: https://git.kernel.org/tip/e2d168328e3bdd21efa2ba34392f620ce58d2914
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Thu, 21 Mar 2024 17:18:47 -04:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 22 Mar 2024 09:37:09 +01:00
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
---
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
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index eabf48c..49cc4b8 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 7bcb829..0000000
--- 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 fef16e3..42bcd42 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 c12624b..ef65453 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)
{
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip: x86/cleanups] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
2024-03-21 21:18 ` [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Brian Gerst
@ 2024-03-22 8:48 ` tip-bot2 for Brian Gerst
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Brian Gerst @ 2024-03-22 8:48 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Brian Gerst, Ingo Molnar, x86, linux-kernel
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 9342164635f86eefbe01258fcfb597945e7ab5a4
Gitweb: https://git.kernel.org/tip/9342164635f86eefbe01258fcfb597945e7ab5a4
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Thu, 21 Mar 2024 17:18:46 -04:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 22 Mar 2024 09:37:09 +01:00
x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240321211847.132473-2-brgerst@gmail.com
---
arch/x86/include/asm/ia32_unistd.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
index aa065c9..7bcb829 100644
--- a/arch/x86/include/asm/ia32_unistd.h
+++ b/arch/x86/include/asm/ia32_unistd.h
@@ -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 */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR
2023-06-19 19:47 [PATCH 0/2] x86: Clean up ia32_unistd.h Brian Gerst
@ 2023-06-19 19:47 ` Brian Gerst
0 siblings, 0 replies; 6+ messages in thread
From: Brian Gerst @ 2023-06-19 19:47 UTC (permalink / raw)
To: linux-kernel, x86
Cc: Thomas Gleixner, Borislav Petkov, H . Peter Anvin,
Peter Zijlstra, Brian Gerst
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/include/asm/ia32_unistd.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/include/asm/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
index aa065c94ccf5..7bcb82951c11 100644
--- a/arch/x86/include/asm/ia32_unistd.h
+++ b/arch/x86/include/asm/ia32_unistd.h
@@ -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 */
--
2.40.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-22 8:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-21 21:18 [PATCH 0/2] x86: Remove ia32_unistd.h Brian Gerst
2024-03-21 21:18 ` [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Brian Gerst
2024-03-22 8:48 ` [tip: x86/cleanups] " tip-bot2 for Brian Gerst
2024-03-21 21:18 ` [PATCH 2/2] x86/syscall/compat: Remove ia32_unistd.h Brian Gerst
2024-03-22 8:48 ` [tip: x86/cleanups] " tip-bot2 for Brian Gerst
-- strict thread matches above, loose matches on Subject: below --
2023-06-19 19:47 [PATCH 0/2] x86: Clean up ia32_unistd.h Brian Gerst
2023-06-19 19:47 ` [PATCH 1/2] x86/syscall/compat: Remove unused macro __SYSCALL_ia32_NR Brian Gerst
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.