Merge tag 'x86_sgx_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / arch / x86 / kernel / cpu / sgx / encl.c

diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
index f65564a..7449ef3 100644 (file)
--- a/arch/x86/kernel/cpu/sgx/encl.c
+++ b/arch/x86/kernel/cpu/sgx/encl.c
@@ -141,7 +141,6 @@ static vm_fault_t sgx_vma_fault(struct vm_fault *vmf)
        struct sgx_encl_page *entry;
        unsigned long phys_addr;
        struct sgx_encl *encl;
-       unsigned long pfn;
        vm_fault_t ret;
 
        encl = vma->vm_private_data;
@@ -168,13 +167,6 @@ static vm_fault_t sgx_vma_fault(struct vm_fault *vmf)
 
        phys_addr = sgx_get_epc_phys_addr(entry->epc_page);
 
-       /* Check if another thread got here first to insert the PTE. */
-       if (!follow_pfn(vma, addr, &pfn)) {
-               mutex_unlock(&encl->lock);
-
-               return VM_FAULT_NOPAGE;
-       }
-
        ret = vmf_insert_pfn(vma, addr, PFN_DOWN(phys_addr));
        if (ret != VM_FAULT_NOPAGE) {
                mutex_unlock(&encl->lock);