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

Commit 437b29d1 authored by Amitoj Kaur Chawla's avatar Amitoj Kaur Chawla Committed by Greg Kroah-Hartman
Browse files

staging: rdma: hfi1: file_ops: Replace ALIGN with PAGE_ALIGN 



mm.h contains a helper function PAGE_ALIGN which aligns the pointer
to the page boundary instead of using ALIGN(expression, PAGE_SIZE)

This change was made with the help of the following Coccinelle
semantic patch:
//<smpl>
@@
expression e;
symbol PAGE_SIZE;
@@
(
- ALIGN(e, PAGE_SIZE)
+ PAGE_ALIGN(e)
|
- IS_ALIGNED(e, PAGE_SIZE)
+ PAGE_ALIGNED(e)
)
//</smpl>

Signed-off-by: default avatarAmitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5389660

drivers/staging/rdma/hfi1/file_ops.c

+2 −3
Original line number Diff line number Diff line
@@ -487,8 +487,7 @@ static int hfi1_file_mmap(struct file *fp, struct vm_area_struct *vma) 
		 * Map only the amount allocated to the context, not the

		 * entire available context's PIO space.

		 */

		memlen = ALIGN(uctxt->sc->credits * PIO_BLOCK_SIZE,

			       PAGE_SIZE);

		memlen = PAGE_ALIGN(uctxt->sc->credits * PIO_BLOCK_SIZE);

		flags &= ~VM_MAYREAD;

		flags |= VM_DONTCOPY | VM_DONTEXPAND;

		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
@@ -638,7 +637,7 @@ static int hfi1_file_mmap(struct file *fp, struct vm_area_struct *vma) 
			goto done;

		}

		memaddr = (u64)cq->comps;

		memlen = ALIGN(sizeof(*cq->comps) * cq->nentries, PAGE_SIZE);

		memlen = PAGE_ALIGN(sizeof(*cq->comps) * cq->nentries);

		flags |= VM_IO | VM_DONTEXPAND;

		vmf = 1;

		break;