Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbbLSOnh (ORCPT ); Sat, 19 Dec 2015 09:43:37 -0500 Received: from pegasus3.altlinux.org ([194.107.17.103]:50317 "EHLO pegasus3.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753924AbbLSOng (ORCPT ); Sat, 19 Dec 2015 09:43:36 -0500 Date: Sat, 19 Dec 2015 17:43:34 +0300 From: "Dmitry V. Levin" To: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , Andy Lutomirski Cc: Elvira Khabirova , X86 ML , linux-kernel@vger.kernel.org Subject: [PATCH v2] x86/signal: Cleanup get_nr_restart_syscall Message-ID: <20151219144334.GA4827@altlinux.org> References: <20151213034437.GA2392@altlinux.org> <20151218233736.GA28013@altlinux.org> <5674FA8A.60806@zytor.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5674FA8A.60806@zytor.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 45 Check for TS_COMPAT instead of TIF_IA32 to distinguish ia32 tasks from 64-bit tasks. Check for __X32_SYSCALL_BIT iff CONFIG_X86_X32_ABI is defined. Signed-off-by: Dmitry V. Levin Cc: Elvira Khabirova Cc: Andy Lutomirski --- v2: reintroduced __NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT) arch/x86/kernel/signal.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index cb6282c..c07ff5d 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -692,12 +692,15 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs) static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs) { -#if defined(CONFIG_X86_32) || !defined(CONFIG_X86_64) +#ifdef CONFIG_X86_64 + if (is_ia32_task()) + return __NR_ia32_restart_syscall; +#endif +#ifdef CONFIG_X86_X32_ABI + return __NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT); +#else return __NR_restart_syscall; -#else /* !CONFIG_X86_32 && CONFIG_X86_64 */ - return test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : - __NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT); -#endif /* CONFIG_X86_32 || !CONFIG_X86_64 */ +#endif } /* -- ldv -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/