On Thu, Sep 22, 2022 at 10:10:39AM -0700, Kristen Carlson Accardi wrote: > From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > > A future patch will use the owner field for either a pointer to > a struct sgx_encl, or a struct sgx_encl_page. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > Signed-off-by: Kristen Carlson Accardi <kristen@xxxxxxxxxxxxxxx> > Cc: Sean Christopherson <seanjc@xxxxxxxxxx> > --- > arch/x86/kernel/cpu/sgx/sgx.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h > index 0f2020653fba..5a7e858a8f98 100644 > --- a/arch/x86/kernel/cpu/sgx/sgx.h > +++ b/arch/x86/kernel/cpu/sgx/sgx.h > @@ -33,7 +33,7 @@ struct sgx_epc_page { > unsigned int section; > u16 flags; > u16 poison; > - struct sgx_encl_page *owner; > + void *owner; > struct list_head list; > }; > > -- > 2.37.3 > Conflicts with https://lore.kernel.org/linux-sgx/20220920063948.3556917-1-zhiquan1.li@xxxxxxxxx/T/#m5c911085eb350df564db2c18e344ce036e269749 BR, Jarkko