| Message ID | 20200314033051.32137-1-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/sgx: Fix a build error introduced by WARN->ENCLS_WARN conversion | expand |
On Fri, Mar 13, 2020 at 08:30:51PM -0700, Sean Christopherson wrote: > Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> 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
On Sun, Mar 15, 2020 at 08:11:30PM +0200, Jarkko Sakkinen wrote: > On Fri, Mar 13, 2020 at 08:30:51PM -0700, Sean Christopherson wrote: > > Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure. > > > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > > 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
diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c b/arch/x86/kernel/cpu/sgx/reclaim.c index 9afe5e7d50a6..eb5008c37b64 100644 --- a/arch/x86/kernel/cpu/sgx/reclaim.c +++ b/arch/x86/kernel/cpu/sgx/reclaim.c @@ -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); }
Remove an unwanted param when invoking ENCLS_WARN on EREMOVE failure. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kernel/cpu/sgx/reclaim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)