Skip to contentSkip to conversation

x86/sgx: Fix a build error introduced by WARN->ENCLS_WARN conversion

PATCH In review Sean Christopherson 2 participants 3 messages Mar 14, 2020 – Mar 15, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/sgx: Fix a build error introduced by WARN->ENCLS_WARN conversion

Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure.

---
 arch/x86/kernel/cpu/sgx/reclaim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/reclaim.c +1 -1
index 9afe5e7d50a6..eb5008c37b64 100644
@@ -352,7 +352,7 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page,
 
 	if (atomic_read(&encl->flags) & SGX_ENCL_DEAD) {
 		ret = __eremove(sgx_epc_addr(epc_page));
-		ENCLS_WARN(ret, "EREMOVE returned %d\n", ret);
+		ENCLS_WARN(ret, "EREMOVE returned %d\n");
 	} else {
 		sgx_encl_ewb(epc_page, backing);
 	}
Signature · 1 line
2.24.1
#1 lore raw
Quoted 3 lines · Sean Christopherson

Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure.

Applied [1].

Had not set $LINUX_OVERRIDE_SRCDIR when building my BuildRoot environment which caused buildroot to pull remote version of the kernel tree instead of local. I.e. ended up compiling kernel without the change that caused this compilation failure.

/Jarkko

#2 lore raw
Quoted 11 lines · Jarkko Sakkinen
Quoted 3 lines · Sean Christopherson

Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure.

Applied [1].

Had not set $LINUX_OVERRIDE_SRCDIR when building my BuildRoot environment which caused buildroot to pull remote version of the kernel tree instead of local. I.e. ended up compiling kernel without the change that caused this compilation failure.

Not that this is an excuse to leak that kind of code, just trying to backtrack things whenever this kind of stuff happens. Try to be more careful next time.

/Jarkko