Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mthca: Clear ICM pages before handing to FW
This commit is contained in:
commit
f6837bfa65
1 changed files with 5 additions and 1 deletions
|
@ -109,7 +109,11 @@ static int mthca_alloc_icm_pages(struct scatterlist *mem, int order, gfp_t gfp_m
|
||||||
{
|
{
|
||||||
struct page *page;
|
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)
|
if (!page)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue