Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1219646

[PATCH v2] x86/asm/entry/64: Minor cleanup of conditional compilation

Show all headers | View raw

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 <nikolay.b.borisov@gmail.com>
---

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

--
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/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] x86/asm/entry/64: Minor cleanup of conditional compilation Nikolay Borisov <nikolay.b.borisov@gmail.com> - 2015-09-05 23:00 +0200
  Re: [PATCH v2] x86/asm/entry/64: Minor cleanup of conditional  compilation "H. Peter Anvin" <hpa@zytor.com> - 2015-09-06 08:10 +0200

csiph-web