Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756005AbbGFPtH (ORCPT ); Mon, 6 Jul 2015 11:49:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49687 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753786AbbGFPtE (ORCPT ); Mon, 6 Jul 2015 11:49:04 -0400 Date: Mon, 6 Jul 2015 08:48:21 -0700 From: tip-bot for Brian Gerst Message-ID: Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, peterz@infradead.org, tglx@linutronix.de, luto@amacapital.net, mingo@kernel.org, bp@alien8.de, hpa@zytor.com, dvlasenk@redhat.com, luto@kernel.org Reply-To: peterz@infradead.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, torvalds@linux-foundation.org, dvlasenk@redhat.com, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, bp@alien8.de, tglx@linutronix.de, luto@amacapital.net In-Reply-To: <1434974121-32575-8-git-send-email-brgerst@gmail.com> References: <1434974121-32575-8-git-send-email-brgerst@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/compat: Check for both 32-bit compat and x32 in get_gate_vma() Git-Commit-ID: c338867d0e4224771c68d0a7727289b86c23eccd 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: 1753 Lines: 45 Commit-ID: c338867d0e4224771c68d0a7727289b86c23eccd Gitweb: http://git.kernel.org/tip/c338867d0e4224771c68d0a7727289b86c23eccd Author: Brian Gerst AuthorDate: Mon, 22 Jun 2015 07:55:16 -0400 Committer: Ingo Molnar CommitDate: Mon, 6 Jul 2015 15:28:57 +0200 x86/compat: Check for both 32-bit compat and x32 in get_gate_vma() Change this to CONFIG_COMPAT so both 32-bit compat and x32 will do the check. Signed-off-by: Brian Gerst Acked-by: Andy Lutomirski 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-8-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c index 2dcc6ff..26a46f4 100644 --- a/arch/x86/entry/vsyscall/vsyscall_64.c +++ b/arch/x86/entry/vsyscall/vsyscall_64.c @@ -290,7 +290,7 @@ static struct vm_area_struct gate_vma = { struct vm_area_struct *get_gate_vma(struct mm_struct *mm) { -#ifdef CONFIG_IA32_EMULATION +#ifdef CONFIG_COMPAT if (!mm || mm->context.ia32_compat) return NULL; #endif -- 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/