[PATCH] fix CONFIG_DISCONTIGMEM and CONFIG_VIRTUAL_MEMMAP

[Jesse Barnes <jbarnes@engr.sgi.com>]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Looks like the patch that fixed Ian's problem introduced an ugly warning.  
Maybe we could just switch to requiring CONFIG_DISCONTIGMEM and 
CONFIG_VIRTUAL_MEMMAP for ia64 in general?  That would let us kill a lot of 
code and only have one code path, etc.  Benchmarks have shown that the 
overhead of CONFIG_DISCONTIGMEM is very difficult to measure (if you look at 
the code, the only added overhead in any fast path is an additional pointer 
dereference in alloc_pages).  CONFIG_VIRTUAL_MEMMAP is a little more 
expensive iirc, but still difficult to measure.

Jesse

[-- Attachment #2: virtual-memmap+discontig-fix.patch --]
[-- Type: text/x-diff, Size: 966 bytes --]

===== include/asm-ia64/page.h 1.27 vs edited =====
--- 1.27/include/asm-ia64/page.h	2004-09-02 22:25:57 -07:00
+++ edited/include/asm-ia64/page.h	2004-09-05 08:28:38 -07:00
@@ -89,11 +89,11 @@
 #  define pfn_valid(pfn)       (((pfn) < max_mapnr) && ia64_pfn_valid(pfn))
 #  define page_to_pfn(page)    ((unsigned long) (page - vmem_map))
 #  define pfn_to_page(pfn)     (vmem_map + (pfn))
-# endif
-#else /* !CONFIG_VIRTUAL_MEM_MAP */
-#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 /* !CONFIG_VIRTUAL_MEM_MAP */
+#  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))
+# endif /* CONFIG_VIRTUAL_MEMMAP */
 #endif /* CONFIG_DISCONTIGMEM */
 
 #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)