Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (f6837bfa) · Commits · e / devices / android_kernel_teracube_emerald

drivers/infiniband/hw/mthca/mthca_memfree.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,11 @@ static int mthca_alloc_icm_pages(struct scatterlist *mem, int order, gfp_t gfp_m
		{
		struct page *page;

		page = alloc_pages(gfp_mask, order);
		/*
		* Use __GFP_ZERO because buggy firmware assumes ICM pages are
		* cleared, and subtle failures are seen if they aren't.
		*/
		page = alloc_pages(gfp_mask \| __GFP_ZERO, order);
		if (!page)
		return -ENOMEM;