From: Jarkko Sakkinen <jarkko@kernel.org>
To: linux-sgx@vger.kernel.org, Jarkko Sakkinen <jarkko@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Sean Christopherson <seanjc@google.com>,
Kai Huang <kai.huang@intel.com>
Cc: Shuah Khan <shuah@kernel.org>, Borislav Petkov <bp@suse.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 1/2] x86/sgx: Add the missing ifdef for sgx_set_attribute()
Date: Thu, 26 Aug 2021 02:52:32 +0300 [thread overview]
Message-ID: <20210825235234.153013-1-jarkko@kernel.org> (raw)
Similarly as sgx_virt_*, decorate sgx_set_attribute() with ifdef, so that
calling it without appropraite config flags, will cause a compilation
error, and not a linking error.
Fixes: b3754e5d3da3 ("x86/sgx: Move provisioning device creation out of SGX driver")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
v3:
* Since CONFIG_X86_SGX_KVM depends on CONFIG_X86_SGX surround everything
with CONFIG_X86_SGX config flag.
Link: https://lore.kernel.org/linux-sgx/YR6Bs2twT4EK%2FjUK@google.com/
---
arch/x86/include/asm/sgx.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
index 05f3e21f01a7..996e56590a10 100644
--- a/arch/x86/include/asm/sgx.h
+++ b/arch/x86/include/asm/sgx.h
@@ -365,6 +365,11 @@ struct sgx_sigstruct {
* comment!
*/
+#ifdef CONFIG_X86_SGX
+
+int sgx_set_attribute(unsigned long *allowed_attributes,
+ unsigned int attribute_fd);
+
#ifdef CONFIG_X86_SGX_KVM
int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
int *trapnr);
@@ -372,7 +377,6 @@ int sgx_virt_einit(void __user *sigstruct, void __user *token,
void __user *secs, u64 *lepubkeyhash, int *trapnr);
#endif
-int sgx_set_attribute(unsigned long *allowed_attributes,
- unsigned int attribute_fd);
+#endif /* CONFIG_X86_SGX */
#endif /* _ASM_X86_SGX_H */
--
2.25.1
next reply other threads:[~2021-08-25 23:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-25 23:52 Jarkko Sakkinen [this message]
2021-08-25 23:52 ` [PATCH v3 2/2] x86/sgx: Add SGX_MemTotal to /proc/meminfo Jarkko Sakkinen
2021-08-26 0:39 ` Randy Dunlap
2021-08-26 16:17 ` Jarkko Sakkinen
2021-08-26 20:27 ` Dave Hansen
2021-08-26 22:27 ` Randy Dunlap
2021-09-01 1:51 ` Jarkko Sakkinen
2021-08-26 2:19 ` Kai Huang
2021-08-26 16:27 ` Jarkko Sakkinen
2021-08-27 12:03 ` Kai Huang
2021-09-01 2:02 ` Jarkko Sakkinen
2021-09-01 5:33 ` Kai Huang
2021-09-01 5:41 ` Jarkko Sakkinen
2021-09-01 5:47 ` Kai Huang
2021-09-02 12:15 ` Jarkko Sakkinen
2021-09-02 21:56 ` Kai Huang
2021-09-02 22:14 ` Jarkko Sakkinen
2021-08-26 9:58 ` [PATCH v3 1/2] x86/sgx: Add the missing ifdef for sgx_set_attribute() Borislav Petkov
2021-08-26 16:08 ` Jarkko Sakkinen
2021-08-26 16:35 ` Borislav Petkov
2021-08-26 17:11 ` Jarkko Sakkinen
2021-08-26 17:24 ` Borislav Petkov
2021-08-26 17:31 ` Jarkko Sakkinen
2021-08-26 17:53 ` Borislav Petkov
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=20210825235234.153013-1-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=kai.huang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.