Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756089AbbGFPun (ORCPT ); Mon, 6 Jul 2015 11:50:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49760 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753421AbbGFPui (ORCPT ); Mon, 6 Jul 2015 11:50:38 -0400 Date: Mon, 6 Jul 2015 08:49:43 -0700 From: tip-bot for Brian Gerst Message-ID: Cc: brgerst@gmail.com, luto@amacapital.net, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, bp@alien8.de Reply-To: bp@alien8.de, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com, dvlasenk@redhat.com, brgerst@gmail.com, luto@amacapital.net, linux-kernel@vger.kernel.org In-Reply-To: <1434974121-32575-12-git-send-email-brgerst@gmail.com> References: <1434974121-32575-12-git-send-email-brgerst@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/compat: Clean up HAVE_UID16 config Git-Commit-ID: 0c3619ea6756833e5c636c886cb55ca5b77f5d73 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 Content-Length: 1898 Lines: 52 Commit-ID: 0c3619ea6756833e5c636c886cb55ca5b77f5d73 Gitweb: http://git.kernel.org/tip/0c3619ea6756833e5c636c886cb55ca5b77f5d73 Author: Brian Gerst AuthorDate: Mon, 22 Jun 2015 07:55:20 -0400 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:28:58 +0200 x86/compat: Clean up HAVE_UID16 config Merge the 32-bit compat config setting for HAVE_UID16 with the 32-bit native one. Signed-off-by: Brian Gerst Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1434974121-32575-12-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6e910ba..d823a33 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -132,7 +132,7 @@ config X86 select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_SYSCALL_TRACEPOINTS - select HAVE_UID16 if X86_32 + select HAVE_UID16 if X86_32 || IA32_EMULATION select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_USER_RETURN_NOTIFIER select IRQ_FORCED_THREADING @@ -2516,7 +2516,6 @@ config IA32_EMULATION depends on X86_64 select BINFMT_ELF select COMPAT_BINFMT_ELF - select HAVE_UID16 select ARCH_WANT_OLD_COMPAT_IPC ---help--- Include code to run legacy 32-bit programs under a -- 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/