The following commit has been merged into the x86/core branch of tip:
Commit-ID: 6be9a8f18fb2ea88d37a69f076f7011fc012ae1a
Gitweb: https://git.kernel.org/tip/6be9a8f18fb2ea88d37a69f076f7011fc012ae1a
Author: Brian Gerst <brgerst@xxxxxxxxx>
AuthorDate: Mon, 19 Dec 2022 14:39:04 -05:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 06 Jan 2023 04:16:02 +01:00
x86/signal/compat: Move sigaction_compat_abi() to signal_64.c
Also remove the now-empty signal_compat.c.
Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20221219193904.190220-3-brgerst@xxxxxxxxx
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/Makefile | 1 -
arch/x86/kernel/signal_64.c | 13 +++++++++++++
arch/x86/kernel/signal_compat.c | 15 ---------------
3 files changed, 13 insertions(+), 16 deletions(-)
delete mode 100644 arch/x86/kernel/signal_compat.c
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 96d51bb..dd61752 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -45,7 +45,6 @@ obj-y += head$(BITS).o
obj-y += ebda.o
obj-y += platform-quirks.o
obj-y += process_$(BITS).o signal.o signal_$(BITS).o
-obj-$(CONFIG_COMPAT) += signal_compat.o
obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
obj-y += time.o ioport.o dumpstack.o nmi.o
obj-$(CONFIG_MODIFY_LDT_SYSCALL) += ldt.o
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index 9eea4e8..13a1e60 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -382,6 +382,19 @@ badframe:
}
#endif /* CONFIG_X86_X32_ABI */
+#ifdef CONFIG_COMPAT
+void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact)
+{
+ if (!act)
+ return;
+
+ if (in_ia32_syscall())
+ act->sa.sa_flags |= SA_IA32_ABI;
+ if (in_x32_syscall())
+ act->sa.sa_flags |= SA_X32_ABI;
+}
+#endif /* CONFIG_COMPAT */
+
/*
* If adding a new si_code, there is probably new data in
* the siginfo. Make sure folks bumping the si_code
diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
deleted file mode 100644
index c4e9b85..0000000
--- a/arch/x86/kernel/signal_compat.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/compat.h>
-#include <linux/uaccess.h>
-#include <linux/ptrace.h>
-
-void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact)
-{
- if (!act)
- return;
-
- if (in_ia32_syscall())
- act->sa.sa_flags |= SA_IA32_ABI;
- if (in_x32_syscall())
- act->sa.sa_flags |= SA_X32_ABI;
-}
|