diff options
Diffstat (limited to 'mm/util.c')
| -rw-r--r-- | mm/util.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/util.c b/mm/util.c index 4ed8b9b5273c..8cbbfd3a3d59 100644 --- a/mm/util.c +++ b/mm/util.c @@ -543,7 +543,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,  	if (!ret) {  		if (mmap_write_lock_killable(mm))  			return -EINTR; -		ret = do_mmap(file, addr, len, prot, flag, pgoff, &populate, +		ret = do_mmap(file, addr, len, prot, flag, 0, pgoff, &populate,  			      &uf);  		mmap_write_unlock(mm);  		userfaultfd_unmap_complete(mm, &uf); @@ -1068,7 +1068,9 @@ void mem_dump_obj(void *object)  	if (vmalloc_dump_obj(object))  		return; -	if (virt_addr_valid(object)) +	if (is_vmalloc_addr(object)) +		type = "vmalloc memory"; +	else if (virt_addr_valid(object))  		type = "non-slab/vmalloc memory";  	else if (object == NULL)  		type = "NULL pointer";  |