From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254AbbIEUy2 (ORCPT ); Sat, 5 Sep 2015 16:54:28 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:37611 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbbIEUyV (ORCPT ); Sat, 5 Sep 2015 16:54:21 -0400 From: Nikolay Borisov To: mingo@kernel.org Cc: hpa@zytor.com, dvlasenk@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org, bp@suse.de, Nikolay Borisov Subject: [PATCH v2] x86/asm/entry/64: Minor cleanup of conditional compilation Date: Sat, 5 Sep 2015 23:53:43 +0300 Message-Id: <1441486423-6997-1-git-send-email-nikolay.b.borisov@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The entry_SYSCALL_64_fastpath was checking the value of __SYSCALL_MASK, which in turn was being set in arch/x86/include/asm/unistd.h depending on whether CONFIG_X86_X32_ABI was set or not. This made the intention a bit cryptic. Juggle the code around so that the conditional compilation depends on the value of CONFIG_X86_X32_ABI Signed-off-by: Nikolay Borisov --- Sending v2 as I had forgotten to add my signed-off-by line. arch/x86/entry/entry_64.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 8cb3e43..b0177f9 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -175,11 +175,11 @@ GLOBAL(entry_SYSCALL_64_after_swapgs) testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) jnz tracesys entry_SYSCALL_64_fastpath: -#if __SYSCALL_MASK == ~0 - cmpq $__NR_syscall_max, %rax -#else +#ifdef CONFIG_X86_X32_ABI andl $__SYSCALL_MASK, %eax cmpl $__NR_syscall_max, %eax +#else + cmpq $__NR_syscall_max, %rax #endif ja 1f /* return -ENOSYS (already in pt_regs->ax) */ movq %r10, %rcx -- 2.1.4