summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/page.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/page.h
parentc678796cab4b5288ad578802a54cb1480ae20a08 (diff)
downloadkernel-crypto-1be7d9935b9c7fb9bd5964bfaf3ac543381277db.tar.gz
kernel-crypto-1be7d9935b9c7fb9bd5964bfaf3ac543381277db.tar.xz
kernel-crypto-1be7d9935b9c7fb9bd5964bfaf3ac543381277db.zip
[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/page.h')
-rw-r--r--include/asm-ia64/page.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index 9edffad8c28..ef436b9d06a 100644
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -102,15 +102,15 @@ do { \
#ifdef CONFIG_VIRTUAL_MEM_MAP
extern int ia64_pfn_valid (unsigned long pfn);
-#else
+#elif defined(CONFIG_FLATMEM)
# define ia64_pfn_valid(pfn) 1
#endif
-#ifndef CONFIG_DISCONTIGMEM
+#ifdef CONFIG_FLATMEM
# define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn))
# define page_to_pfn(page) ((unsigned long) (page - mem_map))
# define pfn_to_page(pfn) (mem_map + (pfn))
-#else
+#elif defined(CONFIG_DISCONTIGMEM)
extern struct page *vmem_map;
extern unsigned long max_low_pfn;
# define pfn_valid(pfn) (((pfn) < max_low_pfn) && ia64_pfn_valid(pfn))