diff --git a/[refs] b/[refs]
index 782fd94b56c6..34c2d04c6813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6434b94a16b09ac84a6411adb2bc0b645245d007
+refs/heads/master: 43be594a6b0ce34ab5fa3b13e08727a99fb95b91
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 2ea9cd44aeae..62169c192c21 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -3227,7 +3227,7 @@ static struct kmem_cache *bh_cachep __read_mostly;
  * Once the number of bh's in the machine exceeds this level, we start
  * stripping them in writeback.
  */
-static int max_buffer_heads;
+static unsigned long max_buffer_heads;
 
 int buffer_heads_over_limit;
 
@@ -3343,7 +3343,7 @@ EXPORT_SYMBOL(bh_submit_read);
 
 void __init buffer_init(void)
 {
-	int nrpages;
+	unsigned long nrpages;
 
 	bh_cachep = kmem_cache_create("buffer_head",
 			sizeof(struct buffer_head), 0,