please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a fix for one rare bug seen by SGI on large clusters:
Eli Cohen (1):
IB/mthca: Clear ICM pages before handing to FW
drivers/infiniband/hw/mthca/mthca_memfree.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/infiniband/hw/mthca/mthca_memfree.c +5 -1
@@ -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 ;