From 7d821dc77df54881d64498ea8c6176066593b2f1 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Fri, 6 Jan 2006 00:10:54 -0800
Subject: [PATCH] --- yaml --- r: 16313 b: refs/heads/master c:
 161599ff39a3c3cdea0a1be05ac53accd2c45cdd h: refs/heads/master i:   16311:
 2ae512c27cb9ed5e1e3ebc02ea160c0bea5b60b9 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/mmzone.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7469f5d58ec..df787dd536c2 100644
--- 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
index ee9f7b74e613..8cba76c6a28c 100644
--- 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