[PATCH] x86/sgx: fix the return type of sgx_init

From: Sami Tolvanen
Date: Wed Jan 13 2021 - 18:34:30 EST


device_initcall() expects a function of type initcall_t, which returns
an integer. Change the signature of sgx_init() to match.

Fixes: e7e0545299d8c ("x86/sgx: Initialize metadata for Enclave Page Cache (EPC) sections")
Signed-off-by: Sami Tolvanen <samitolvanen@xxxxxxxxxx>
---
arch/x86/kernel/cpu/sgx/main.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index c519fc5f6948..8df81a3ed945 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -700,25 +700,27 @@ static bool __init sgx_page_cache_init(void)
return true;
}

-static void __init sgx_init(void)
+static int __init sgx_init(void)
{
int ret;
int i;

if (!cpu_feature_enabled(X86_FEATURE_SGX))
- return;
+ return -ENODEV;

if (!sgx_page_cache_init())
- return;
+ return -ENOMEM;

- if (!sgx_page_reclaimer_init())
+ if (!sgx_page_reclaimer_init()) {
+ ret = -ENOMEM;
goto err_page_cache;
+ }

ret = sgx_drv_init();
if (ret)
goto err_kthread;

- return;
+ return 0;

err_kthread:
kthread_stop(ksgxd_tsk);
@@ -728,6 +730,8 @@ static void __init sgx_init(void)
vfree(sgx_epc_sections[i].pages);
memunmap(sgx_epc_sections[i].virt_addr);
}
+
+ return ret;
}

device_initcall(sgx_init);

base-commit: 65f0d2414b7079556fbbcc070b3d1c9f9587606d
--
2.30.0.284.gd98b1dd5eaa7-goog