From 437b29d1159af16b54b6571efb92c6e048d03c15 Mon Sep 17 00:00:00 2001 From: Amitoj Kaur Chawla Date: Fri, 4 Mar 2016 22:45:00 +0530 Subject: [PATCH] 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: // @@ expression e; symbol PAGE_SIZE; @@ ( - ALIGN(e, PAGE_SIZE) + PAGE_ALIGN(e) | - IS_ALIGNED(e, PAGE_SIZE) + PAGE_ALIGNED(e) ) // Signed-off-by: Amitoj Kaur Chawla Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rdma/hfi1/file_ops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rdma/hfi1/file_ops.c b/drivers/staging/rdma/hfi1/file_ops.c index d57d549052c8..8b911e8bf0df 100644 --- a/drivers/staging/rdma/hfi1/file_ops.c +++ b/drivers/staging/rdma/hfi1/file_ops.c @@ -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; -- 2.11.4.GIT