Messages in this thread Patch in this message | | | Date | Wed, 8 Sep 2004 14:45:52 -0700 | From | tony.luck@intel ... | Subject | RE: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM |
| |
>>Thanks Paul, this looks a little simpler than the patch I >>posted (I'd rather just make CONFIG_DISCONTIGMEM and >>CONFIG_VIRTUAL_MEMMAP mandatory on ia64, but that's for >>another patch). Linus, since this breakage is in your >>tree now, can you please apply this assuming Tony has >>no complaints so that people can build on ia64 again? > >I have no complaints. I see that Linus has already >applied Paul's patch to his BK tree.
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>
===== include/asm-ia64/page.h 1.28 vs edited ===== --- 1.28/include/asm-ia64/page.h 2004-09-05 20:48:22 +00:00 +++ edited/include/asm-ia64/page.h 2004-09-08 20:39:23 +00:00 @@ -86,13 +86,14 @@ #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) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |