From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753521AbcISWHD (ORCPT ); Mon, 19 Sep 2016 18:07:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39856 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932336AbcISWHA (ORCPT ); Mon, 19 Sep 2016 18:07:00 -0400 Date: Mon, 19 Sep 2016 15:06:38 -0700 From: tip-bot for Vinson Lee Message-ID: Cc: dvyukov@google.com, linux-kernel@vger.kernel.org, vlee@freedesktop.org, luto@kernel.org, tglx@linutronix.de, dsafonov@virtuozzo.com, mingo@kernel.org, hpa@zytor.com, brgerst@gmail.com, bp@suse.de Reply-To: tglx@linutronix.de, luto@kernel.org, linux-kernel@vger.kernel.org, vlee@freedesktop.org, dvyukov@google.com, brgerst@gmail.com, bp@suse.de, hpa@zytor.com, dsafonov@virtuozzo.com, mingo@kernel.org In-Reply-To: <1474073513-6656-1-git-send-email-vlee@freedesktop.org> References: <1474073513-6656-1-git-send-email-vlee@freedesktop.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/vdso] x86/vdso: Use CONFIG_X86_X32_ABI to enable vdso prctl Git-Commit-ID: 6e68b08728ce3365c713f8663c6b05a79e2bbca1 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: 6e68b08728ce3365c713f8663c6b05a79e2bbca1 Gitweb: http://git.kernel.org/tip/6e68b08728ce3365c713f8663c6b05a79e2bbca1 Author: Vinson Lee AuthorDate: Sat, 17 Sep 2016 00:51:53 +0000 Committer: Thomas Gleixner CommitDate: Tue, 20 Sep 2016 00:01:48 +0200 x86/vdso: Use CONFIG_X86_X32_ABI to enable vdso prctl The prctl code which references vdso_image_x32 is built when CONFIG_X86_X32 is set. This results in the following build failure: LD init/built-in.o arch/x86/built-in.o: In function `do_arch_prctl': (.text+0x27466): undefined reference to `vdso_image_x32' vdso_image_x32 depends on CONFIG_X86_X32_ABI. So we need to make the prctl depend on that as well. [ tglx: Massaged changelog ] Fixes: 2eefd8789698 ("x86/arch_prctl/vdso: Add ARCH_MAP_VDSO_*") Signed-off-by: Vinson Lee Reviewed-by: Dmitry Safonov Cc: Andy Lutomirski Cc: Brian Gerst Cc: Borislav Petkov Cc: Dmitry Vyukov Link: http://lkml.kernel.org/r/1474073513-6656-1-git-send-email-vlee@freedesktop.org Signed-off-by: Thomas Gleixner --- arch/x86/kernel/process_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b26a009..b4603b7 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -592,7 +592,7 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr) } #ifdef CONFIG_CHECKPOINT_RESTORE -# ifdef CONFIG_X86_X32 +# ifdef CONFIG_X86_X32_ABI case ARCH_MAP_VDSO_X32: return prctl_map_vdso(&vdso_image_x32, addr); # endif