[PATCH 3/3] sparse provide pfn_to_nid

Andy Whitcroft
2005-11-16T23:00:23Z

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>
---
mmzone.h | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff -upN reference/include/linux/mmzone.h current/include/linux/mmzone.h
--- reference/include/linux/mmzone.h
+++ current/include/linux/mmzone.h
@@ -598,14 +598,11 @@ static inline int pfn_valid(unsigned lon
return valid_section(__nr_to_section(pfn_to_section_nr(pfn)));
}

-/*
- * These are _only_ used during initialisation, therefore they
- * can use __initdata ... They could have names to indicate
- * this restriction.
- */
-#ifdef CONFIG_NUMA
-#define pfn_to_nid early_pfn_to_nid
-#endif
+#define pfn_to_nid(pfn) \
+({ \
+ unsigned long __pfn = (pfn); \
+ page_to_nid(pfn_to_page(pfn)); \
+})

#define early_pfn_valid(pfn) pfn_valid(pfn)
void sparse_init(void);