| commit | 8cf246aaf4b56227cb84ae8fb773d09498119a88 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Nov 20 16:10:56 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Nov 20 16:10:56 2013 -0800 |
| tree | 58dc17900d3d373596842c36733c818f3053719c | |
| parent | 8aa1d5b6355192ce6c58fbefbf84aaebf3104285 [diff] | |
| parent | 02f31e5bdff1985477ea04001d9b7b72f8a48928 [diff] |
Merge "zram: Disable allocation failure logging"
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 91d94b5..a7476d6 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c
@@ -221,7 +221,8 @@ goto free_buffer; } - meta->mem_pool = zs_create_pool(GFP_NOIO | __GFP_HIGHMEM); + meta->mem_pool = zs_create_pool(GFP_NOIO | __GFP_HIGHMEM | + __GFP_NOWARN); if (!meta->mem_pool) { pr_err("Error creating memory pool\n"); goto free_table;