From d499af58e01dfc8c2e969a81efc0e204573ce2dd Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com>
Date: Wed, 30 Nov 2011 14:16:16 +0100
Subject: [PATCH] --- yaml --- r: 281312 b: refs/heads/master c:
 fb927284e4d3a0c50a47063ff9be1fe3f5511f61 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a5b4cf3130e5..87ac42fe8ff1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04e7bbad44c1a0c449719f90d507d13e015f1444
+refs/heads/master: fb927284e4d3a0c50a47063ff9be1fe3f5511f61
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index 09de99fbb7e0..2a2a92d389e6 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -653,7 +653,8 @@ int zram_init_device(struct zram *zram)
 		goto fail_no_table;
 	}
 
-	zram->compress_buffer = (void *)__get_free_pages(__GFP_ZERO, 1);
+	zram->compress_buffer =
+		(void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1);
 	if (!zram->compress_buffer) {
 		pr_err("Error allocating compressor buffer space\n");
 		ret = -ENOMEM;