Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f2b6ce8 authored by Tobin C Harding's avatar Tobin C Harding Committed by Linus Torvalds
Browse files

mm/memory.c: use NULL instead of literal 0 

Patch fixes sparse warning: Using plain integer as NULL pointer.
Replaces assignment of 0 to pointer with NULL assignment.

Link: http://lkml.kernel.org/r/1485992240-10986-2-git-send-email-me@tobin.cc


Signed-off-by: default avatarTobin C Harding <me@tobin.cc>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2bf14d1

mm/memory.c

+3 −3
Original line number Diff line number Diff line
@@ -2920,7 +2920,7 @@ static int pte_alloc_one_map(struct vm_fault *vmf) 
		atomic_long_inc(&vma->vm_mm->nr_ptes);

		pmd_populate(vma->vm_mm, vmf->pmd, vmf->prealloc_pte);

		spin_unlock(vmf->ptl);

		vmf->prealloc_pte = 0;

		vmf->prealloc_pte = NULL;

	} else if (unlikely(pte_alloc(vma->vm_mm, vmf->pmd, vmf->address))) {

		return VM_FAULT_OOM;

	}
@@ -2968,7 +2968,7 @@ static void deposit_prealloc_pte(struct vm_fault *vmf) 
	 * count that as nr_ptes.

	 */

	atomic_long_inc(&vma->vm_mm->nr_ptes);

	vmf->prealloc_pte = 0;

	vmf->prealloc_pte = NULL;

}



static int do_set_pmd(struct vm_fault *vmf, struct page *page)
@@ -3374,7 +3374,7 @@ static int do_fault(struct vm_fault *vmf) 
	/* preallocated pagetable is unused: free it */

	if (vmf->prealloc_pte) {

		pte_free(vma->vm_mm, vmf->prealloc_pte);

		vmf->prealloc_pte = 0;

		vmf->prealloc_pte = NULL;

	}

	return ret;

}