---

yaml --- r: 354149 b: refs/heads/master c: e49ee36 h: refs/heads/master i: 354147: e1728e5 v: v3
git-mirror · Jan 25, 2013 · deeb167 · deeb167
1 parent 212fb68
commit deeb167
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -103,15 +103,18 @@ 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;
 			struct list_head lru;
 		};
 	};
 };
+#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 {