diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-26 09:24:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-26 09:24:23 +0200 |
| commit | 9a13150109fb418c50fa400c012f90d0ce6f67c3 (patch) | |
| tree | 237d8ee3b8b87984776b5aa0f05b92f84d372a1d /drivers/infiniband/hw | |
| parent | 3ccf79f4570acacfefc51772e8f9207895b35ad7 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | blackbird-op-linux-9a13150109fb418c50fa400c012f90d0ce6f67c3.tar.gz blackbird-op-linux-9a13150109fb418c50fa400c012f90d0ce6f67c3.zip | |
Merge commit 'v2.6.26-rc8' into core/rcu
Diffstat (limited to 'drivers/infiniband/hw')
| -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; |
