Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1219646
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Nikolay Borisov <nikolay.b.borisov@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v2] x86/asm/entry/64: Minor cleanup of conditional compilation |
| Date | Sat, 05 Sep 2015 23:00:01 +0200 |
| Message-ID | <q5sJ3-39f-13@gated-at.bofh.it> (permalink) |
| X-Original-To | mingo@kernel.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=zAimjeGoS4qIBLcVahS0MEI0ow6OH0M8jmCkCozIAes=; b=tJaKXK1Mbnwd4HROdN2K1GqrojadHNlvHEHitfxgkyrcAEh4ZECAK6lf1Zx1NI1s3y 9BBLIS1peUa4/9YJvxzmrxnMslKObICr0VtwSWufzwHQpVh99hangtoEinIcTB9GbPAk /X0dVV7fiMBvrnYMnUMxOEIjG2N+fTkHhsx2VnFbwtogBKeIWFi+dDzfo7tBc8wZbcc+ w4gjm0UfR3fKZNR6HCvePq7ivo+kQAQMdiGRgnL0s/JtbC42Ojx7nli+oR/VufbQ4zWs 0sHd/Q1Hm5OhgytPlRQ2E901u3B7vTx7zBesu/Mcn7qoz65M/K4Tq+mkCAsNevRez9Z7 bSLw== |
| X-Received | by 10.180.211.11 with SMTP id my11mr19047865wic.51.1441486460005; Sat, 05 Sep 2015 13:54:20 -0700 (PDT) |
| X-Mailer | git-send-email 2.1.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 43 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | hpa@zytor.com, dvlasenk@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org, bp@suse.de, Nikolay Borisov <nikolay.b.borisov@gmail.com> |
| X-Original-Date | Sat, 5 Sep 2015 23:53:43 +0300 |
| X-Original-Message-ID | <1441486423-6997-1-git-send-email-nikolay.b.borisov@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1219646 |
Show key headers only | 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
[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