[PATCH] SN2 build fix, take two

I want to change my vote :-) The problem isn't a spurious extra "#else"
(which Paul's patch removed) ...  it is a missing "#endif"

Here's a patch that puts the #else back, adds the #endif, and fixes the
whitespace to make this nested mess of pre-processor noise a bit more
legible.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index 9352301938b8e583a34f5c02f6400ab376285c5d..15e6eafc80282a17345369cacd1201c24916607a 100644 (file)
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -86,13 +86,14 @@ extern int ia64_pfn_valid (unsigned long pfn);
 #ifndef CONFIG_DISCONTIGMEM
 # ifdef CONFIG_VIRTUAL_MEM_MAP
 extern struct page *vmem_map;
-#  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))
+#  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))
+# else
+#  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
-#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_DISCONTIGMEM */
 
 #define page_to_phys(page)     (page_to_pfn(page) << PAGE_SHIFT)