It's hard to add new content to this function because it is time
consuming to match fallback and its cause. Rename labels in a way
that the name of error label refers to the site where failure
happened. This way it is easier to keep on track what is going
on.
Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
---
v5: A new patch.
---
arch/x86/kernel/cpu/sgx/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 63d3de02bbcc..a6e313f1a82d 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -803,12 +803,12 @@ static int __init sgx_init(void)
if (!sgx_page_reclaimer_init()) {
ret = -ENOMEM;
- goto err_page_cache;
+ goto err_reclaimer;
}
ret = misc_register(&sgx_dev_provision);
if (ret)
- goto err_kthread;
+ goto err_provision;
/*
* Always try to initialize the native *and* KVM drivers.
@@ -821,17 +821,17 @@ static int __init sgx_init(void)
ret = sgx_drv_init();
if (sgx_vepc_init() && ret)
- goto err_provision;
+ goto err_driver;
return 0;
-err_provision:
+err_driver:
misc_deregister(&sgx_dev_provision);
-err_kthread:
+err_provision:
kthread_stop(ksgxd_tsk);
-err_page_cache:
+err_reclaimer:
for (i = 0; i < sgx_nr_epc_sections; i++) {
vfree(sgx_epc_sections[i].pages);
memunmap(sgx_epc_sections[i].virt_addr);
--
2.25.1
