Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753088AbbLSGfR (ORCPT ); Sat, 19 Dec 2015 01:35:17 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34937 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752478AbbLSGfQ (ORCPT ); Sat, 19 Dec 2015 01:35:16 -0500 Subject: Re: [PATCH] x86/signal: Cleanup get_nr_restart_syscall To: "Dmitry V. Levin" , Thomas Gleixner , Ingo Molnar , Andy Lutomirski References: <20151213034437.GA2392@altlinux.org> <20151218233736.GA28013@altlinux.org> Cc: Elvira Khabirova , X86 ML , "linux-kernel@vger.kernel.org" From: "H. Peter Anvin" Message-ID: <5674FA8A.60806@zytor.com> Date: Fri, 18 Dec 2015 22:34:50 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151218233736.GA28013@altlinux.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1658 Lines: 48 On 12/18/15 15:37, Dmitry V. Levin wrote: > Check for TS_COMPAT instead of TIF_IA32 to distinguish ia32 tasks > from 64-bit tasks. > Check for __X32_SYSCALL_BIT only if CONFIG_X86_X32_ABI is defined. > > Signed-off-by: Dmitry V. Levin > Cc: Elvira Khabirova > Cc: Andy Lutomirski > --- > 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..ff7dedc 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; > +# ifdef CONFIG_X86_X32_ABI > + if (regs->orig_ax & __X32_SYSCALL_BIT) > + return __NR_restart_syscall | __X32_SYSCALL_BIT; > +# endif > +#endif > 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 */ > } > > /* > I bet you actually made the code slower. -hpa -- 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/