Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933474AbbFVL4h (ORCPT ); Mon, 22 Jun 2015 07:56:37 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:34867 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756262AbbFVLzs (ORCPT ); Mon, 22 Jun 2015 07:55:48 -0400 From: Brian Gerst To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Ingo Molnar , "H. Peter Anvin" , Denys Vlasenko , Andy Lutomirski Subject: [PATCH 07/12] x86/compat: get_gate_vma should check for both 32-bit compat and x32 Date: Mon, 22 Jun 2015 07:55:16 -0400 Message-Id: <1434974121-32575-8-git-send-email-brgerst@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1434974121-32575-1-git-send-email-brgerst@gmail.com> References: <1434974121-32575-1-git-send-email-brgerst@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 811 Lines: 27 Change this to CONFIG_COMPAT so both 32-bit compat and x32 will do the check. Signed-off-by: Brian Gerst --- 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 -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/