In order to introduce the counting of active sgx users on top of clean functions that allocate vepc structures, covert existing sgx_(vepc_)open to __sgx_(vepc_)open. Later patch will introduce the top level wrappers that manage the usage count.
No functional change intended in this patch. Signed-off-by: Elena Reshetova <elena.reshet...@intel.com> --- arch/x86/kernel/cpu/sgx/driver.c | 4 ++-- arch/x86/kernel/cpu/sgx/virt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/driver.c b/arch/x86/kernel/cpu/sgx/driver.c index 7f8d1e11dbee..9aa48f455c54 100644 --- a/arch/x86/kernel/cpu/sgx/driver.c +++ b/arch/x86/kernel/cpu/sgx/driver.c @@ -14,7 +14,7 @@ u64 sgx_attributes_reserved_mask; u64 sgx_xfrm_reserved_mask = ~0x3; u32 sgx_misc_reserved_mask; -static int sgx_open(struct inode *inode, struct file *file) +static int __sgx_open(struct inode *inode, struct file *file) { struct sgx_encl *encl; int ret; @@ -126,7 +126,7 @@ static long sgx_compat_ioctl(struct file *filep, unsigned int cmd, static const struct file_operations sgx_encl_fops = { .owner = THIS_MODULE, - .open = sgx_open, + .open = __sgx_open, .release = sgx_release, .unlocked_ioctl = sgx_ioctl, #ifdef CONFIG_COMPAT diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c index 7aaa3652e31d..d8fdf7f39215 100644 --- a/arch/x86/kernel/cpu/sgx/virt.c +++ b/arch/x86/kernel/cpu/sgx/virt.c @@ -258,7 +258,7 @@ static int sgx_vepc_release(struct inode *inode, struct file *file) return 0; } -static int sgx_vepc_open(struct inode *inode, struct file *file) +static int __sgx_vepc_open(struct inode *inode, struct file *file) { struct sgx_vepc *vepc; @@ -291,7 +291,7 @@ static long sgx_vepc_ioctl(struct file *file, static const struct file_operations sgx_vepc_fops = { .owner = THIS_MODULE, - .open = sgx_vepc_open, + .open = __sgx_vepc_open, .unlocked_ioctl = sgx_vepc_ioctl, .compat_ioctl = sgx_vepc_ioctl, .release = sgx_vepc_release, -- 2.45.2