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

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

staging: rdma: hfi1: 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 c754db40

drivers/staging/rdma/hfi1/init.c

+4 −4
Original line number Diff line number Diff line
@@ -735,8 +735,8 @@ int hfi1_init(struct hfi1_devdata *dd, int reinit) 
		ret = lastfail;



	/* Allocate enough memory for user event notification. */

	len = ALIGN(dd->chip_rcv_contexts * HFI1_MAX_SHARED_CTXTS *

		    sizeof(*dd->events), PAGE_SIZE);

	len = PAGE_ALIGN(dd->chip_rcv_contexts * HFI1_MAX_SHARED_CTXTS *

			 sizeof(*dd->events));

	dd->events = vmalloc_user(len);

	if (!dd->events)

		dd_dev_err(dd, "Failed to allocate user events page\n");
@@ -1505,8 +1505,8 @@ int hfi1_create_rcvhdrq(struct hfi1_devdata *dd, struct hfi1_ctxtdata *rcd) 
		 * rcvhdrqentsize is in DWs, so we have to convert to bytes

		 * (* sizeof(u32)).

		 */

		amt = ALIGN(rcd->rcvhdrq_cnt * rcd->rcvhdrqentsize *

			    sizeof(u32), PAGE_SIZE);

		amt = PAGE_ALIGN(rcd->rcvhdrq_cnt * rcd->rcvhdrqentsize *

				 sizeof(u32));



		gfp_flags = (rcd->ctxt >= dd->first_user_ctxt) ?

			GFP_USER : GFP_KERNEL;

drivers/staging/rdma/hfi1/user_sdma.c

+1 −2
Original line number Diff line number Diff line
@@ -413,8 +413,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp) 
	if (!cq)

		goto cq_nomem;



	memsize = ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size,

			PAGE_SIZE);

	memsize = PAGE_ALIGN(sizeof(*cq->comps) * hfi1_sdma_comp_ring_size);

	cq->comps = vmalloc_user(memsize);

	if (!cq->comps)

		goto cq_comps_nomem;