From 58f932b0b19a4a0e1cd7bce1a25f5e1671f77e08 Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@linux.vnet.ibm.com>
Date: Mon, 22 Aug 2011 14:30:38 -0500
Subject: [PATCH] --- yaml --- r: 267600 b: refs/heads/master c:
 dbe82eb1170c0095e0ce89676235e0b27d7040d1 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/zcache/zcache-main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 06e51807afbc..6f461f13bc6a 100644
--- 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
index 855a5bb56a47..cdf0128fb55c 100644
--- 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;