---

yaml --- r: 267600 b: refs/heads/master c: dbe82eb h: refs/heads/master v: v3
git-mirror · Aug 23, 2011 · 58f932b · 58f932b
1 parent 4e4e172
commit 58f932b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58af58007e7bf61ba21133fa42ad2106f72a03a1
+refs/heads/master: dbe82eb1170c0095e0ce89676235e0b27d7040d1
diff --git a/trunk/drivers/staging/zcache/zcache-main.c b/trunk/drivers/staging/zcache/zcache-main.c
@@ -1668,7 +1668,7 @@ static int zcache_new_pool(uint16_t cli_id, uint32_t flags)
 	if (cli == NULL)
 		goto out;
 	atomic_inc(&cli->refcount);
-	pool = kmalloc(sizeof(struct tmem_pool), GFP_KERNEL);
+	pool = kmalloc(sizeof(struct tmem_pool), GFP_ATOMIC);
 	if (pool == NULL) {
 		pr_info("zcache: pool creation failed: out of memory\n");
 		goto out;