diff --git a/[refs] b/[refs]
index de02cc373f5f..722744ffd800 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6004e1b7effcbb385a6b7c790e4b8008682cf679
+refs/heads/master: 1dff7f3db5f045ccbfeca5bb00b0958a78501557
diff --git a/trunk/include/asm-x86_64/mmzone.h b/trunk/include/asm-x86_64/mmzone.h
index b40c661f111e..8d48dc7e43a7 100644
--- a/trunk/include/asm-x86_64/mmzone.h
+++ b/trunk/include/asm-x86_64/mmzone.h
@@ -41,9 +41,7 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr)
 #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT)
 #define kvaddr_to_nid(kaddr)	phys_to_nid(__pa(kaddr))
 
-/* AK: this currently doesn't deal with invalid addresses. We'll see 
-   if the 2.5 kernel doesn't pass them
-   (2.4 used to). */
+/* Requires pfn_valid(pfn) to be true */
 #define pfn_to_page(pfn) ({ \
 	int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); 	\
 	((pfn) - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map;	\