From 74f46a076da5e5cd623fb6d92d5e55e3e03f1e66 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Wed, 8 Sep 2004 00:52:20 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- include/asm-ia64/page.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9352301938b8..15e6eafc8028 100644 --- 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) -- cgit v1.2.3