diff --git a/[refs] b/[refs]
index ca2bd2d4d29e..dcdf1f4422c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8f6ec2e61f650fd1a316a207a00965bcb8805d4
+refs/heads/master: d8af8582c321414087ed46512ffe5ce4f5c9c5da
diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h
index ae060c62aff1..18546d8eb78e 100644
--- a/trunk/include/asm-generic/memory_model.h
+++ b/trunk/include/asm-generic/memory_model.h
@@ -34,7 +34,7 @@
 
 #define __pfn_to_page(pfn)			\
 ({	unsigned long __pfn = (pfn);		\
-	unsigned long __nid = arch_pfn_to_nid(pfn);  \
+	unsigned long __nid = arch_pfn_to_nid(__pfn);  \
 	NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\
 })