diff --git a/[refs] b/[refs]
index 7e3f21dad489..f47515aeed63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 268433b8e54486b12478e94ba18587bcc7de4d57
+refs/heads/master: 33278f7f0a9e5a9b29f59e07b7e3182d27769ac2
diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c
index 4eb05302e2e1..5524e8bd7437 100644
--- a/trunk/mm/page_cgroup.c
+++ b/trunk/mm/page_cgroup.c
@@ -475,7 +475,7 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
 	if (!do_swap_account)
 		return 0;
 
-	length = ((max_pages/SC_PER_PAGE) + 1);
+	length = DIV_ROUND_UP(max_pages, SC_PER_PAGE);
 	array_size = length * sizeof(void *);
 
 	array = vmalloc(array_size);