---

yaml --- r: 16313 b: refs/heads/master c: 161599f h: refs/heads/master i: 16311: 2ae512c v: v3
git-mirror · Jan 6, 2006 · 7d821dc · 7d821dc
1 parent 4e77f8f
commit 7d821dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bdaf115b1c364d89484b59d5b937973f1c5a5c3
+refs/heads/master: 161599ff39a3c3cdea0a1be05ac53accd2c45cdd
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
@@ -596,7 +596,11 @@ static inline int pfn_valid(unsigned long pfn)
  * this restriction.
  */
 #ifdef CONFIG_NUMA
-#define pfn_to_nid		early_pfn_to_nid
+#define pfn_to_nid(pfn)							\
+({									\
+	unsigned long __pfn_to_nid_pfn = (pfn);				\
+	page_to_nid(pfn_to_page(__pfn_to_nid_pfn));			\
+})
 #else
 #define pfn_to_nid(pfn)		(0)
 #endif