diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:05 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:05 +0200 |
commit | 773dc8eacaedb2e8c8d0defb5de2c66ea7dc4a08 (patch) | |
tree | 1bfa945dcfbcc4a60e31714f768ef38155c621d3 /drivers/infiniband/hw/mthca/mthca_memfree.c | |
parent | 961ccddd59d627b89bd3dc284b6517833bbdf25d (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into sched/new-API-sched_setschedulertip-sched-new-API-sched_setscheduler-2008-06-25_10.27_Wed
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_memfree.c')
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index b224079d4e1f..d5862e5d99a0 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -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; |