diff --git a/[refs] b/[refs]
index 22794b030af2..0a0b0f2dbedc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b04c6890f0dc7ea6c85b9adebc883c55c667d97
+refs/heads/master: 818db35992c249dc32c1d86daf7d533fb0952f5d
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index ce64b6616376..7be94342bf06 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -2012,7 +2012,7 @@ static int shmem_parse_options(char *options, int *mode, uid_t *uid,
 			}
 			if (*rest)
 				goto bad_val;
-			*blocks = size >> PAGE_CACHE_SHIFT;
+			*blocks = DIV_ROUND_UP(size, PAGE_CACHE_SIZE);
 		} else if (!strcmp(this_char,"nr_blocks")) {
 			*blocks = memparse(value,&rest);
 			if (*rest)