diff --git a/[refs] b/[refs]
index d4aa1912ae7f..10e716a5680b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4048c641ad7769e4197ff114eaab01f4662cbca
+refs/heads/master: e49ee36d2477e405da1fe0e6efbf4c122df3b300
diff --git a/trunk/drivers/staging/zcache/zbud.c b/trunk/drivers/staging/zcache/zbud.c
index a7c436127aa1..6835fab5d116 100644
--- a/trunk/drivers/staging/zcache/zbud.c
+++ b/trunk/drivers/staging/zcache/zbud.c
@@ -103,8 +103,8 @@ struct zbudpage {
 		struct {
 			unsigned long space_for_flags;
 			struct {
-				unsigned zbud0_size:12;
-				unsigned zbud1_size:12;
+				unsigned zbud0_size: PAGE_SHIFT;
+				unsigned zbud1_size: PAGE_SHIFT;
 				unsigned unevictable:2;
 			};
 			struct list_head budlist;
@@ -112,6 +112,9 @@ struct zbudpage {
 		};
 	};
 };
+#if (PAGE_SHIFT * 2) + 2 > BITS_PER_LONG
+#error "zbud won't work for this arch, PAGE_SIZE is too large"
+#endif
 
 struct zbudref {
 	union {