Commit f8697636 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/vmur: use new address translation helpers 



Use virt_to_dma32() and friends to properly convert virtual to physical and
physical to virtual addresses so that "make C=1" does not generate any
warnings anymore.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 850ae345

drivers/s390/char/vmur.c

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void free_chan_prog(struct ccw1 *cpa) 
	struct ccw1 *ptr = cpa;



	while (ptr->cda) {

		kfree(phys_to_virt(ptr->cda));

		kfree(dma32_to_virt(ptr->cda));

		ptr++;

	}

	kfree(cpa);
@@ -237,7 +237,7 @@ static struct ccw1 *alloc_chan_prog(const char __user *ubuf, int rec_count, 
			free_chan_prog(cpa);

			return ERR_PTR(-ENOMEM);

		}

		cpa[i].cda = (u32)virt_to_phys(kbuf);

		cpa[i].cda = virt_to_dma32(kbuf);

		if (copy_from_user(kbuf, ubuf, reclen)) {

			free_chan_prog(cpa);

			return ERR_PTR(-EFAULT);