[PATCH 1/2] flatmem split out memory model

Andy Whitcroft
2005-11-22T18:07:34Z

pfn_to_nid is memory model specific

The pfn_to_nid() call is memory model specific. It represents the
locality identifier for the memory passed. Classically this would
be a NUMA node, but not a chunk of memory under DISCONTIGMEM.

The SPARSEMEM and FLATMEM memory model non-NUMA versions of
pfn_to_nid() are folded together under NEED_MULTIPLE_NODES, while
DISCONTIGMEM has its own optimisation. This is all very confusing.

This patch splits out each implementation of pfn_to_nid() so that we
can see them and the optimisations to each.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
mmzone.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -upN reference/include/linux/mmzone.h current/include/linux/mmzone.h
--- reference/include/linux/mmzone.h
+++ current/include/linux/mmzone.h
@@ -445,7 +445,6 @@ extern struct pglist_data contig_page_da
#define NODE_DATA(nid) (&contig_page_data)
#define NODE_MEM_MAP(nid) mem_map
#define MAX_NODES_SHIFT 1
-#define pfn_to_nid(pfn) (0)

#else /* CONFIG_NEED_MULTIPLE_NODES */

@@ -480,6 +479,10 @@ extern struct pglist_data contig_page_da
#define early_pfn_to_nid(nid) (0UL)
#endif

+#ifdef CONFIG_FLATMEM
+#define pfn_to_nid(pfn) (0)
+#endif
+
#define pfn_to_section_nr(pfn) ((pfn) >> PFN_SECTION_SHIFT)
#define section_nr_to_pfn(sec) ((sec) << PFN_SECTION_SHIFT)

@@ -604,6 +607,8 @@ static inline int pfn_valid(unsigned lon
*/
#ifdef CONFIG_NUMA
#define pfn_to_nid early_pfn_to_nid
+#else
+#define pfn_to_nid(pfn) (0)
#endif

#define early_pfn_valid(pfn) pfn_valid(pfn)