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

Commit 1a29d85e authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

mm: use vmf->address instead of of vmf->virtual_address 

Every single user of vmf->virtual_address typed that entry to unsigned
long before doing anything with it so the type of virtual_address does
not really provide us any additional safety.  Just use masked
vmf->address which already has the appropriate type.

Link: http://lkml.kernel.org/r/1479460644-25076-3-git-send-email-jack@suse.cz


Signed-off-by: default avatarJan Kara <jack@suse.cz>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 82b0f8c3

arch/powerpc/platforms/cell/spufs/file.c

+3 −5
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ static int 
spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct spu_context *ctx	= vma->vm_file->private_data;

	unsigned long address = (unsigned long)vmf->virtual_address;

	unsigned long pfn, offset;



	offset = vmf->pgoff << PAGE_SHIFT;
@@ -244,7 +243,7 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
		return VM_FAULT_SIGBUS;



	pr_debug("spufs_mem_mmap_fault address=0x%lx, offset=0x%lx\n",

			address, offset);

			vmf->address, offset);



	if (spu_acquire(ctx))

		return VM_FAULT_NOPAGE;
@@ -256,7 +255,7 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
		vma->vm_page_prot = pgprot_noncached_wc(vma->vm_page_prot);

		pfn = (ctx->spu->local_store_phys + offset) >> PAGE_SHIFT;

	}

	vm_insert_pfn(vma, address, pfn);

	vm_insert_pfn(vma, vmf->address, pfn);



	spu_release(ctx);
@@ -355,8 +354,7 @@ static int spufs_ps_fault(struct vm_area_struct *vma, 
		down_read(&current->mm->mmap_sem);

	} else {

		area = ctx->spu->problem_phys + ps_offs;

		vm_insert_pfn(vma, (unsigned long)vmf->virtual_address,

					(area + offset) >> PAGE_SHIFT);

		vm_insert_pfn(vma, vmf->address, (area + offset) >> PAGE_SHIFT);

		spu_context_trace(spufs_ps_fault__insert, ctx, ctx->spu);

	}

arch/x86/entry/vdso/vma.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int vvar_fault(const struct vm_special_mapping *sm, 
		return VM_FAULT_SIGBUS;



	if (sym_offset == image->sym_vvar_page) {

		ret = vm_insert_pfn(vma, (unsigned long)vmf->virtual_address,

		ret = vm_insert_pfn(vma, vmf->address,

				    __pa_symbol(&__vvar_page) >> PAGE_SHIFT);

	} else if (sym_offset == image->sym_pvclock_page) {

		struct pvclock_vsyscall_time_info *pvti =
@@ -117,7 +117,7 @@ static int vvar_fault(const struct vm_special_mapping *sm, 
		if (pvti && vclock_was_used(VCLOCK_PVCLOCK)) {

			ret = vm_insert_pfn(

				vma,

				(unsigned long)vmf->virtual_address,

				vmf->address,

				__pa(pvti) >> PAGE_SHIFT);

		}

	}

drivers/char/agp/alpha-agp.c

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ static int alpha_core_agp_vm_fault(struct vm_area_struct *vma, 
	unsigned long pa;

	struct page *page;



	dma_addr = (unsigned long)vmf->virtual_address - vma->vm_start

						+ agp->aperture.bus_base;

	dma_addr = vmf->address - vma->vm_start + agp->aperture.bus_base;

	pa = agp->ops->translate(agp, dma_addr);



	if (pa == (unsigned long)-EINVAL)

drivers/char/mspec.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 * be because another thread has installed the pte first, so it

	 * is no problem.

	 */

	vm_insert_pfn(vma, (unsigned long)vmf->virtual_address, pfn);

	vm_insert_pfn(vma, vmf->address, pfn);



	return VM_FAULT_NOPAGE;

}

drivers/dax/dax.c

+1 −2
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ static phys_addr_t pgoff_to_phys(struct dax_dev *dax_dev, pgoff_t pgoff, 
static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma,

		struct vm_fault *vmf)

{

	unsigned long vaddr = (unsigned long) vmf->virtual_address;

	struct device *dev = &dax_dev->dev;

	struct dax_region *dax_region;

	int rc = VM_FAULT_SIGBUS;
@@ -353,7 +352,7 @@ static int __dax_dev_fault(struct dax_dev *dax_dev, struct vm_area_struct *vma, 


	pfn = phys_to_pfn_t(phys, dax_region->pfn_flags);



	rc = vm_insert_mixed(vma, vaddr, pfn);

	rc = vm_insert_mixed(vma, vmf->address, pfn);



	if (rc == -ENOMEM)

		return VM_FAULT_OOM;