From: tip-bot for Vinson Lee <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/vdso] x86/vdso: Use CONFIG_X86_X32_ABI to enable vdso prctl
Date: Mon, 19 Sep 2016 15:06:38 -0700 [thread overview]
Message-ID: <tip-6e68b08728ce3365c713f8663c6b05a79e2bbca1@git.kernel.org> (raw)
In-Reply-To: <1474073513-6656-1-git-send-email-vlee@freedesktop.org>
Commit-ID: 6e68b08728ce3365c713f8663c6b05a79e2bbca1
Gitweb: http://git.kernel.org/tip/6e68b08728ce3365c713f8663c6b05a79e2bbca1
Author: Vinson Lee <vlee@freedesktop.org>
AuthorDate: Sat, 17 Sep 2016 00:51:53 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <vlee@freedesktop.org>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Link: http://lkml.kernel.org/r/1474073513-6656-1-git-send-email-vlee@freedesktop.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
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
prev parent reply other threads:[~2016-09-19 22:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-17 0:51 [PATCH] x86/vdso: Add ARCH_MAP_VDSO_X32 if CONFIG_X86_X32_ABI Vinson Lee
2016-09-19 11:33 ` Dmitry Safonov
2016-09-19 22:06 ` tip-bot for Vinson Lee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6e68b08728ce3365c713f8663c6b05a79e2bbca1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=dsafonov@virtuozzo.com \
--cc=dvyukov@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=vlee@freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome