Commit 6be9a8f1 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/signal/compat: Move sigaction_compat_abi() to signal_64.c 



Also remove the now-empty signal_compat.c.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20221219193904.190220-3-brgerst@gmail.com
Cc: Al Viro <viro@zeniv.linux.org.uk>
parent f6e2a56c

arch/x86/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/signal_64.c

+13 −0
Original line number Diff line number Diff line
@@ -382,6 +382,19 @@ COMPAT_SYSCALL_DEFINE0(x32_rt_sigreturn) 
}

#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

arch/x86/kernel/signal_compat.c

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
// 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;

}