---

yaml --- r: 281312 b: refs/heads/master c: fb92728 h: refs/heads/master v: v3
git-mirror · Dec 8, 2011 · d499af5 · d499af5
1 parent ceabfdb
commit d499af5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;