diff --git a/[refs] b/[refs]
index 9078de35570b..9df10f7bab9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a88a13d0624769088ae220e40c2f542f1661eb3
+refs/heads/master: f05b6284ee5d3be51ebe22284fc4b25fc586f380
diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h
index 8078cbd2c016..30d8d33491dd 100644
--- a/trunk/include/asm-generic/memory_model.h
+++ b/trunk/include/asm-generic/memory_model.h
@@ -54,7 +54,7 @@
 #define __page_to_pfn(pg)					\
 ({	struct page *__pg = (pg);				\
 	int __sec = page_to_section(__pg);			\
-	__pg - __section_mem_map_addr(__nr_to_section(__sec));	\
+	(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec)));	\
 })
 
 #define __pfn_to_page(pfn)				\