From: Andy Whitcroft <apw@shadowen.org>
Date: Fri, 6 Jan 2006 08:10:54 +0000 (-0800)
Subject: [PATCH] sparsemem: provide pfn_to_nid
X-Git-Tag: v2.6.16-rc1~936^2~263
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161599ff39a3c3cdea0a1be05ac53accd2c45cdd;p=linux-2.6

[PATCH] sparsemem: provide pfn_to_nid

Before SPARSEMEM is initialised we cannot provide an efficient pfn_to_nid()
implmentation; before initialisation is complete we use early_pfn_to_nid()
to provide location information.  Until recently there was no non-init user
of this functionality.  Provide a post init pfn_to_nid() implementation.

Note that this implmentation assumes that the pfn passed has been validated
with pfn_valid().  The current single user of this function already has
this check.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index ee9f7b74e6..8cba76c6a2 100644
--- a/include/linux/mmzone.h
+++ b/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