From 79fe13233f502801cd93241d9ed39f09e73da8a4 Mon Sep 17 00:00:00 2001
From: Jerome Marchand <jmarchan@redhat.com>
Date: Fri, 17 Dec 2010 17:02:28 +0100
Subject: [PATCH] --- yaml --- r: 235615 b: refs/heads/master c:
 f2da98739da4e20e907f8317d513868764002d31 h: refs/heads/master i:   235613:
 ffba2f5366414e993273c63960afe584892b7c8f   235611:
 65e479b3aee85f50d05e74b91abab76036c45b3a   235607:
 bf282f73db9d4d8f914fa886b38751942f3c84e6   235599:
 34b4c547e994849d71740bf00a0c3d1b80d6bc11   235583:
 b467d675eac043f91e3fb547469ab699946ca7f7 v: v3

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

diff --git a/[refs] b/[refs]
index f1ebac4add13..b7b1c5c85089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b152873469d2b0751e8b726df6415f05e37632e
+refs/heads/master: f2da98739da4e20e907f8317d513868764002d31
diff --git a/trunk/drivers/staging/zram/zram_sysfs.c b/trunk/drivers/staging/zram/zram_sysfs.c
index ad62db221b6f..a70cc010d18d 100644
--- a/trunk/drivers/staging/zram/zram_sysfs.c
+++ b/trunk/drivers/staging/zram/zram_sysfs.c
@@ -14,6 +14,7 @@
 
 #include <linux/device.h>
 #include <linux/genhd.h>
+#include <linux/mm.h>
 
 #include "zram_drv.h"
 
@@ -65,7 +66,7 @@ static ssize_t disksize_store(struct device *dev,
 	if (ret)
 		return ret;
 
-	zram->disksize &= PAGE_MASK;
+	zram->disksize = PAGE_ALIGN(zram->disksize);
 	set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
 
 	return len;