summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/mmzone.h
diff options
context:
space:
mode:
authorBob Picco <bob.picco@hp.com>2005-10-04 15:13:50 -0400
committerTony Luck <tony.luck@intel.com>2005-10-04 13:21:13 -0700
commit1be7d9935b9c7fb9bd5964bfaf3ac543381277db (patch)
treefe39c6d9e19fb890812318f5f3b318de6c3afc57 /include/asm-ia64/mmzone.h
parentc678796cab4b5288ad578802a54cb1480ae20a08 (diff)
downloadop-kernel-dev-1be7d9935b9c7fb9bd5964bfaf3ac543381277db.zip
op-kernel-dev-1be7d9935b9c7fb9bd5964bfaf3ac543381277db.tar.gz
[PATCH] V5 ia64 SPARSEMEM - conditional changes for SPARSEMEM
This patch introduces the conditional changes required for the three memory models. With [patch 1/4] there are three memory models; FLATMEM, DISCONTIG and SPARSEMEM. Also a new arch include file sparemem.h is introduced for defining SPARSEMEM parameters. Signed-off-by: Bob Picco <bob.picco@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/mmzone.h')
-rw-r--r--include/asm-ia64/mmzone.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
index d32f51e..34efe88 100644
--- a/include/asm-ia64/mmzone.h
+++ b/include/asm-ia64/mmzone.h
@@ -15,7 +15,7 @@
#include <asm/page.h>
#include <asm/meminit.h>
-#ifdef CONFIG_DISCONTIGMEM
+#ifdef CONFIG_NUMA
static inline int pfn_to_nid(unsigned long pfn)
{
@@ -31,6 +31,10 @@ static inline int pfn_to_nid(unsigned long pfn)
#endif
}
+#ifdef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
+extern int early_pfn_to_nid(unsigned long pfn);
+#endif
+
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)
@@ -39,8 +43,8 @@ static inline int pfn_to_nid(unsigned long pfn)
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
#endif
-#else /* CONFIG_DISCONTIGMEM */
+#else /* CONFIG_NUMA */
# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
-#endif /* CONFIG_DISCONTIGMEM */
+#endif /* CONFIG_NUMA */
#endif /* _ASM_IA64_MMZONE_H */
OpenPOWER on IntegriCloud