[PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[Paul Jackson]

The change on 2004-09-03 by ianw@xxxxxxxxxxxxxxxxxx appears to have
a typo, which causes builds of configurations which define both
CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM to emit some 890
warnings for redefines of each of pfn_valid, page_to_pfn,
pfn_to_page.  This shows up compiling sn2_defconfig, the SN2
config of arch ia64.  I believe that this is a simply typo,
an extra "#else" line.  Removing this exta line enables sn2_defconfig
to build as before.  Builds of other arch's untested.  No effort
made to boot this.

Signed-off-by: Paul Jackson <pj@xxxxxxx>

--- 2.6.9-rc1-pre/include/asm-ia64/page.h	2004-09-05 13:39:15.000000000 -0700
+++ 2.6.9-rc1-post/include/asm-ia64/page.h	2004-09-05 13:48:22.000000000 -0700
@@ -90,7 +90,6 @@ extern struct page *vmem_map;
 #  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))

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@xxxxxxx> 1.650.933.1373
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/