From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756083AbcJ1GuU (ORCPT ); Fri, 28 Oct 2016 02:50:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49404 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbcJ1GuO (ORCPT ); Fri, 28 Oct 2016 02:50:14 -0400 Date: Thu, 27 Oct 2016 23:48:55 -0700 From: tip-bot for Dmitry Safonov Message-ID: Cc: mingo@kernel.org, brgerst@gmail.com, gorcunov@openvz.org, luto@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, pebolle@tiscali.nl, dsafonov@virtuozzo.com, peterz@infradead.org, dvlasenk@redhat.com, bp@alien8.de, jpoimboe@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: brgerst@gmail.com, gorcunov@openvz.org, mingo@kernel.org, luto@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, dsafonov@virtuozzo.com, bp@alien8.de, dvlasenk@redhat.com, peterz@infradead.org, pebolle@tiscali.nl, tglx@linutronix.de, jpoimboe@redhat.com, torvalds@linux-foundation.org In-Reply-To: <20161027141516.28447-2-dsafonov@virtuozzo.com> References: <20161027141516.28447-2-dsafonov@virtuozzo.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/prctl/uapi: Remove #ifdef for CHECKPOINT_RESTORE Git-Commit-ID: a01aa6c9f40fe03c82032e7f8b3bcf1e6c93ac0e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a01aa6c9f40fe03c82032e7f8b3bcf1e6c93ac0e Gitweb: http://git.kernel.org/tip/a01aa6c9f40fe03c82032e7f8b3bcf1e6c93ac0e Author: Dmitry Safonov AuthorDate: Thu, 27 Oct 2016 17:15:15 +0300 Committer: Ingo Molnar CommitDate: Fri, 28 Oct 2016 08:15:55 +0200 x86/prctl/uapi: Remove #ifdef for CHECKPOINT_RESTORE As userspace knows nothing about kernel config, thus #ifdefs around ABI prctl constants makes them invisible to userspace. Let it be clean'n'simple: remove #ifdefs. If kernel has CONFIG_CHECKPOINT_RESTORE disabled, sys_prctl() will return -EINVAL for those prctls. Reported-by: Paul Bolle Signed-off-by: Dmitry Safonov Acked-by: Andy Lutomirski Cc: 0x7f454c46@gmail.com Cc: Borislav Petkov Cc: Brian Gerst Cc: Cyrill Gorcunov Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-mm@kvack.org Cc: oleg@redhat.com Fixes: 2eefd8789698 ("x86/arch_prctl/vdso: Add ARCH_MAP_VDSO_*") Link: http://lkml.kernel.org/r/20161027141516.28447-2-dsafonov@virtuozzo.com Signed-off-by: Ingo Molnar --- arch/x86/include/uapi/asm/prctl.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/uapi/asm/prctl.h b/arch/x86/include/uapi/asm/prctl.h index ae135de..835aa51 100644 --- a/arch/x86/include/uapi/asm/prctl.h +++ b/arch/x86/include/uapi/asm/prctl.h @@ -6,10 +6,8 @@ #define ARCH_GET_FS 0x1003 #define ARCH_GET_GS 0x1004 -#ifdef CONFIG_CHECKPOINT_RESTORE -# define ARCH_MAP_VDSO_X32 0x2001 -# define ARCH_MAP_VDSO_32 0x2002 -# define ARCH_MAP_VDSO_64 0x2003 -#endif +#define ARCH_MAP_VDSO_X32 0x2001 +#define ARCH_MAP_VDSO_32 0x2002 +#define ARCH_MAP_VDSO_64 0x2003 #endif /* _ASM_X86_PRCTL_H */