[for_v21] x86/sgx: Annotate SGX driver init functions with __init
diff mbox series

Message ID 20190711175836.16120-1-sean.j.christopherson@intel.com
State New
Headers show
Series
  • [for_v21] x86/sgx: Annotate SGX driver init functions with __init
Related show

Commit Message

Sean Christopherson July 11, 2019, 5:58 p.m. UTC
The SGX driver can no longer be built as a loadable module, ergo its
initialization functions are only called during actual init.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 arch/x86/kernel/cpu/sgx/driver/driver.h | 2 +-
 arch/x86/kernel/cpu/sgx/driver/main.c   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

Comments

Jarkko Sakkinen July 12, 2019, 2:51 a.m. UTC | #1
On Thu, Jul 11, 2019 at 10:58:36AM -0700, Sean Christopherson wrote:
> The SGX driver can no longer be built as a loadable module, ergo its
> initialization functions are only called during actual init.
> 
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>

Sure, just something forgot to done. Thanks.

/Jarkko

Patch
diff mbox series

diff --git a/arch/x86/kernel/cpu/sgx/driver/driver.h b/arch/x86/kernel/cpu/sgx/driver/driver.h
index c71570a9cd01..8af7c38dddd0 100644
--- a/arch/x86/kernel/cpu/sgx/driver/driver.h
+++ b/arch/x86/kernel/cpu/sgx/driver/driver.h
@@ -34,6 +34,6 @@  extern u32 sgx_xsave_size_tbl[64];
 extern const struct file_operations sgx_provision_fops;
 
 long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
-int sgx_drv_init(void);
+int __init sgx_drv_init(void);
 
 #endif /* __ARCH_X86_INTEL_SGX_H__ */
diff --git a/arch/x86/kernel/cpu/sgx/driver/main.c b/arch/x86/kernel/cpu/sgx/driver/main.c
index c7fc32e26105..da6d849d3cb4 100644
--- a/arch/x86/kernel/cpu/sgx/driver/main.c
+++ b/arch/x86/kernel/cpu/sgx/driver/main.c
@@ -198,10 +198,9 @@  static void sgx_dev_release(struct device *dev)
 {
 }
 
-static int sgx_dev_init(const char *name, struct device *dev,
-			struct cdev *cdev,
-			const struct file_operations *fops,
-			int minor)
+static __init int sgx_dev_init(const char *name, struct device *dev,
+			       struct cdev *cdev,
+			       const struct file_operations *fops, int minor)
 {
 	int ret;
 
@@ -222,7 +221,7 @@  static int sgx_dev_init(const char *name, struct device *dev,
 	return 0;
 }
 
-int sgx_drv_init(void)
+int __init sgx_drv_init(void)
 {
 	unsigned int eax, ebx, ecx, edx;
 	u64 attr_mask, xfrm_mask;