diff --git a/[refs] b/[refs]
index 2700d67da85f..202c1e260dfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83e5d8f7253cb7b14472385a6d57df1e9f848e8e
+refs/heads/master: c2f29ea111e3344ed48257c2a142c3db514e1529
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index f2ee9b2332e3..f5a6695d4d21 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -135,7 +135,7 @@ struct page_state {
 
 extern void get_page_state(struct page_state *ret);
 extern void get_full_page_state(struct page_state *ret);
-extern unsigned long __read_page_state(unsigned offset);
+extern unsigned long __read_page_state(unsigned long offset);
 extern void __mod_page_state(unsigned long offset, unsigned long delta);
 
 #define read_page_state(member) \
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index c976628f9d95..10446a646374 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1144,7 +1144,7 @@ void get_full_page_state(struct page_state *ret)
 	__get_page_state(ret, sizeof(*ret) / sizeof(unsigned long));
 }
 
-unsigned long __read_page_state(unsigned offset)
+unsigned long __read_page_state(unsigned long offset)
 {
 	unsigned long ret = 0;
 	int cpu;