UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/sgx: Fix the return type of sgx_init() 

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

Fixes: e7e0545299 ("x86/sgx: Initialize metadata for Enclave Page Cache (EPC) sections")
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Link: https://lkml.kernel.org/r/20210113232311.277302-1-samitolvanen@google.com
This commit is contained in:
Sami Tolvanen 2021-01-13 15:23:11 -08:00 committed by Borislav Petkov
parent 7c53f6b671
commit 31bf928817
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/cpu/sgx/main.c
View File

@ -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 @@ err_page_cache:
vfree(sgx_epc_sections[i].pages);
memunmap(sgx_epc_sections[i].virt_addr);
}
return ret;
}
device_initcall(sgx_init);