From: "tip-bot2 for Nathan Chancellor" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Nathan Chancellor <nathan@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Nick Desaulniers <ndesaulniers@google.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/vdso: Conditionally export __vdso_sgx_enter_enclave()
Date: Fri, 09 Dec 2022 14:02:13 -0000 [thread overview]
Message-ID: <167059453391.4906.374881146743460680.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221109000306.1407357-1-nathan@kernel.org>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 45be2ad007a9c6bea70249c4cf3e4905afe4caeb
Gitweb: https://git.kernel.org/tip/45be2ad007a9c6bea70249c4cf3e4905afe4caeb
Author: Nathan Chancellor <nathan@kernel.org>
AuthorDate: Tue, 08 Nov 2022 17:03:07 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 09 Dec 2022 14:58:02 +01:00
x86/vdso: Conditionally export __vdso_sgx_enter_enclave()
Recently, ld.lld moved from '--undefined-version' to
'--no-undefined-version' as the default, which breaks building the vDSO
when CONFIG_X86_SGX is not set:
ld.lld: error: version script assignment of 'LINUX_2.6' to symbol '__vdso_sgx_enter_enclave' failed: symbol not defined
__vdso_sgx_enter_enclave is only included in the vDSO when
CONFIG_X86_SGX is set. Only export it if it will be present in the final
object, which clears up the error.
Fixes: 8466436952017 ("x86/vdso: Implement a vDSO for Intel SGX enclave call")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1756
Link: https://lore.kernel.org/r/20221109000306.1407357-1-nathan@kernel.org
---
arch/x86/entry/vdso/vdso.lds.S | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/entry/vdso/vdso.lds.S b/arch/x86/entry/vdso/vdso.lds.S
index 4bf4846..e8c60ae 100644
--- a/arch/x86/entry/vdso/vdso.lds.S
+++ b/arch/x86/entry/vdso/vdso.lds.S
@@ -27,7 +27,9 @@ VERSION {
__vdso_time;
clock_getres;
__vdso_clock_getres;
+#ifdef CONFIG_X86_SGX
__vdso_sgx_enter_enclave;
+#endif
local: *;
};
}
prev parent reply other threads:[~2022-12-09 14:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 0:03 [PATCH] x86/vdso: Conditionally export __vdso_sgx_enter_enclave Nathan Chancellor
2022-11-10 20:46 ` Nick Desaulniers
2022-12-09 13:46 ` Nathan Chancellor
2022-12-09 13:54 ` Thomas Gleixner
2022-12-09 15:55 ` Nathan Chancellor
2022-12-09 14:02 ` tip-bot2 for Nathan Chancellor [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=167059453391.4906.374881146743460680.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®