Hi Srikar,
Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/signal.c between commit c5a373942bbc ("x32:
Signal-related system calls") from the tip tree and commit 1e1e2cddc33d
("x86/trivial: use is_ia32_compat_task") from the uprobes tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/x86/kernel/signal.c
index 5134e17,907d483..0000000
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@@ -37,7 -37,15 +38,8 @@@
#include <asm/syscalls.h>
#include <asm/sigframe.h>
+ #include <asm/compat.h>
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-#define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \
- X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
- X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
- X86_EFLAGS_CF)
-
#ifdef CONFIG_X86_32
# define FIX_EFLAGS (__FIX_EFLAGS | X86_EFLAGS_RF)
#else
@@@ -628,22 -637,6 +629,16 @@@ static int signr_convert(int sig
#else /* !CONFIG_X86_32 */
- #ifdef CONFIG_IA32_EMULATION
- #define is_ia32 test_thread_flag(TIF_IA32)
- #else /* !CONFIG_IA32_EMULATION */
- #define is_ia32 0
- #endif /* CONFIG_IA32_EMULATION */
-
+#ifdef CONFIG_X86_X32_ABI
+#define is_x32 test_thread_flag(TIF_X32)
+
+static int x32_setup_rt_frame(int sig, struct k_sigaction *ka,
+ siginfo_t *info, compat_sigset_t *set,
+ struct pt_regs *regs);
+#else /* !CONFIG_X86_X32_ABI */
+#define is_x32 0
+#endif /* CONFIG_X86_X32_ABI */
+
int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs);
int ia32_setup_frame(int sig, struct k_sigaction *ka,
Attachment:
pgp7CulJ8Tusq.pgp
Description: PGP signature
