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

[tip-bot2 for Sami Tolvanen]

The following commit has been merged into the x86/sgx branch of tip:

Commit-ID:     31bf92881714fe9962d43d097b5114a9b4ad0a12
Gitweb:        
https://git.kernel.org/tip/31bf92881714fe9962d43d097b5114a9b4ad0a12
Author:        Sami Tolvanen <samitolva...@google.com>
AuthorDate:    Wed, 13 Jan 2021 15:23:11 -08:00
Committer:     Borislav Petkov <b...@suse.de>
CommitterDate: Thu, 21 Jan 2021 14:04:06 +01:00

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: e7e0545299d8c ("x86/sgx: Initialize metadata for Enclave Page Cache 
(EPC) sections")
Signed-off-by: Sami Tolvanen <samitolva...@google.com>
Signed-off-by: Borislav Petkov <b...@suse.de>
Reviewed-by: Darren Kenny <darren.ke...@oracle.com>
Reviewed-by: Jarkko Sakkinen <jar...@kernel.org>
Link: https://lkml.kernel.org/r/20210113232311.277302-1-samitolva...@google.com
---
 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 c519fc5..8df81a3 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 @@ err_page_cache:
                vfree(sgx_epc_sections[i].pages);
                memunmap(sgx_epc_sections[i].virt_addr);
        }
+
+       return ret;
 }
 
 device_initcall(sgx_init);