Pull for-each-cpu into release branch

[linux-2.6] / include / asm-ia64 / page.h

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index ec17f9e9da75c35944fe52cac94c57390d97cda0..ef436b9d06ad4580923f65c78c9ceac3a14e8942 100644 (file)
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -17,9 +17,9 @@
  * Different regions are assigned to different purposes.
  */
 #define RGN_SHIFT      (61)
-#define RGN_BASE(r)  (__IA64_UL_CONST(r)<<RGN_SHIFT)
+#define RGN_BASE(r)    (__IA64_UL_CONST(r)<<RGN_SHIFT)
+#define RGN_BITS       (RGN_BASE(-1))
 
-#define KHIGH -1       /* high three bits of Kernel virtual address */
 #define RGN_KERNEL     7       /* Identity mapped region */
 #define RGN_UNCACHED    6      /* Identity mapped I/O region */
 #define RGN_GATE       5       /* Gate page, Kernel text, etc */
@@ -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))