RE: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

RE: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[tony.luck]

>>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)

Re: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[Paul Jackson]

Tony wrote:
> I want to change my vote :-) 

Thanks, Tony.

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

RE: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[Luck, Tony]

>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.

-Tony

[PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[Paul Jackson]

The change on 2004-09-03 by ianw@gelato.unsw.edu.au 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@sgi.com>

--- 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@sgi.com> 1.650.933.1373

Re: [PATCH] SN2 build fix CONFIG_VIRTUAL_MEM_MAP and CONFIG_DISCONTIGMEM

[Jesse Barnes]

On Sunday, September 5, 2004 2:18 pm, Paul Jackson wrote:
> The change on 2004-09-03 by ianw@gelato.unsw.edu.au 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@sgi.com>

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?

Thanks,
Jesse