openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amitoj Kaur Chawla 2016-03-04 22:45:00 +05:30 committed by Greg Kroah-Hartman
parent f538966081
commit 437b29d115
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rdma/hfi1/file_ops.c
View File

@ -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 * Map only the amount allocated to the context, not the
* entire available context's PIO space. * entire available context's PIO space.
*/ */
memlen = ALIGN(uctxt->sc->credits * PIO_BLOCK_SIZE, memlen = PAGE_ALIGN(uctxt->sc->credits * PIO_BLOCK_SIZE);
PAGE_SIZE);
flags &= ~VM_MAYREAD; flags &= ~VM_MAYREAD;
flags |= VM_DONTCOPY | VM_DONTEXPAND; flags |= VM_DONTCOPY | VM_DONTEXPAND;
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); 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; goto done;
} }
memaddr = (u64)cq->comps; 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; flags |= VM_IO | VM_DONTEXPAND;
vmf = 1; vmf = 1;
break; break;