summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 6040b74d02a2..747a2cdd2f7d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2920,7 +2920,7 @@ static int pte_alloc_one_map(struct vm_fault *vmf)
2920 atomic_long_inc(&vma->vm_mm->nr_ptes); 2920 atomic_long_inc(&vma->vm_mm->nr_ptes);
2921 pmd_populate(vma->vm_mm, vmf->pmd, vmf->prealloc_pte); 2921 pmd_populate(vma->vm_mm, vmf->pmd, vmf->prealloc_pte);
2922 spin_unlock(vmf->ptl); 2922 spin_unlock(vmf->ptl);
2923 vmf->prealloc_pte = 0; 2923 vmf->prealloc_pte = NULL;
2924 } else if (unlikely(pte_alloc(vma->vm_mm, vmf->pmd, vmf->address))) { 2924 } else if (unlikely(pte_alloc(vma->vm_mm, vmf->pmd, vmf->address))) {
2925 return VM_FAULT_OOM; 2925 return VM_FAULT_OOM;
2926 } 2926 }
@@ -2968,7 +2968,7 @@ static void deposit_prealloc_pte(struct vm_fault *vmf)
2968 * count that as nr_ptes. 2968 * count that as nr_ptes.
2969 */ 2969 */
2970 atomic_long_inc(&vma->vm_mm->nr_ptes); 2970 atomic_long_inc(&vma->vm_mm->nr_ptes);
2971 vmf->prealloc_pte = 0; 2971 vmf->prealloc_pte = NULL;
2972} 2972}
2973 2973
2974static int do_set_pmd(struct vm_fault *vmf, struct page *page) 2974static int do_set_pmd(struct vm_fault *vmf, struct page *page)
@@ -3374,7 +3374,7 @@ static int do_fault(struct vm_fault *vmf)
3374 /* preallocated pagetable is unused: free it */ 3374 /* preallocated pagetable is unused: free it */
3375 if (vmf->prealloc_pte) { 3375 if (vmf->prealloc_pte) {
3376 pte_free(vma->vm_mm, vmf->prealloc_pte); 3376 pte_free(vma->vm_mm, vmf->prealloc_pte);
3377 vmf->prealloc_pte = 0; 3377 vmf->prealloc_pte = NULL;
3378 } 3378 }
3379 return ret; 3379 return ret;
3380} 3380}