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

From: Nikolay Borisov
Date: Sat Sep 05 2015 - 16:38:47 EST

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

Juggle the code around so that the conditional compilation depends on
the value of CONFIG_X86_X32_ABI
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)
jnz tracesys
-#if __SYSCALL_MASK == ~0
- cmpq $__NR_syscall_max, %rax
+#ifdef CONFIG_X86_X32_ABI
andl $__SYSCALL_MASK, %eax
cmpl $__NR_syscall_max, %eax
+ cmpq $__NR_syscall_max, %rax
ja 1f /* return -ENOSYS (already in pt_regs->ax) */
movq %r10, %rcx

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/