Patchwork linux-next: build failure

login
register
mail settings
Submitter Stephen Rothwell
Date Oct. 16, 2008, 9:29 a.m.
Message ID <20081016202907.978d00b1.sfr@canb.auug.org.au>
Download mbox | patch
Permalink /patch/4682/
State Accepted, archived
Commit 463baa8a0947f858d6db1c56d87eeaf1176ba7bb
Headers show

Comments

Stephen Rothwell - Oct. 16, 2008, 9:29 a.m.
Hi all,

Today's linux-next build (powerpc allyesconfig) failed like this:

In file included from arch/powerpc/include/asm/mmu-hash64.h:17,
                 from arch/powerpc/include/asm/mmu.h:8,
                 from arch/powerpc/include/asm/pgtable.h:8,
                 from arch/powerpc/mm/slb.c:20:
arch/powerpc/include/asm/page.h:76: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'memstart_addr'
arch/powerpc/include/asm/page.h:77: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'kernstart_addr'

Caused by commit 600715dcdf567c86f8b2c6173fcfb4b873e25a19 ("generic: add
phys_addr_t for holding physical addresses") from the tip-core tree.
This only fails if CONFIG_RELOCATABLE is set.

I have applied the patch below.
Ingo Molnar - Oct. 16, 2008, 10:39 a.m.
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> In file included from arch/powerpc/include/asm/mmu-hash64.h:17,
>                  from arch/powerpc/include/asm/mmu.h:8,
>                  from arch/powerpc/include/asm/pgtable.h:8,
>                  from arch/powerpc/mm/slb.c:20:
> arch/powerpc/include/asm/page.h:76: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'memstart_addr'
> arch/powerpc/include/asm/page.h:77: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'kernstart_addr'
> 
> Caused by commit 600715dcdf567c86f8b2c6173fcfb4b873e25a19 ("generic: add
> phys_addr_t for holding physical addresses") from the tip-core tree.
> This only fails if CONFIG_RELOCATABLE is set.
> 
> I have applied the patch below.

applied to tip/core/urgent, thanks Stephen!

	Ingo
Jeremy Fitzhardinge - Oct. 16, 2008, 4:11 p.m.
Ingo Molnar wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>   
>> Hi all,
>>
>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>
>> In file included from arch/powerpc/include/asm/mmu-hash64.h:17,
>>                  from arch/powerpc/include/asm/mmu.h:8,
>>                  from arch/powerpc/include/asm/pgtable.h:8,
>>                  from arch/powerpc/mm/slb.c:20:
>> arch/powerpc/include/asm/page.h:76: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'memstart_addr'
>> arch/powerpc/include/asm/page.h:77: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'kernstart_addr'
>>
>> Caused by commit 600715dcdf567c86f8b2c6173fcfb4b873e25a19 ("generic: add
>> phys_addr_t for holding physical addresses") from the tip-core tree.
>> This only fails if CONFIG_RELOCATABLE is set.
>>
>> I have applied the patch below.
>>     
>
> applied to tip/core/urgent, thanks Stephen!
>   

Shouldn't this go via a ppc tree?  Won't having ppc changes in tip.git 
make people grumpy?

    J
Ingo Molnar - Oct. 16, 2008, 4:14 p.m.
* Jeremy Fitzhardinge <jeremy@goop.org> wrote:

> Ingo Molnar wrote:
>> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>>   
>>> Hi all,
>>>
>>> Today's linux-next build (powerpc allyesconfig) failed like this:
>>>
>>> In file included from arch/powerpc/include/asm/mmu-hash64.h:17,
>>>                  from arch/powerpc/include/asm/mmu.h:8,
>>>                  from arch/powerpc/include/asm/pgtable.h:8,
>>>                  from arch/powerpc/mm/slb.c:20:
>>> arch/powerpc/include/asm/page.h:76: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'memstart_addr'
>>> arch/powerpc/include/asm/page.h:77: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'kernstart_addr'
>>>
>>> Caused by commit 600715dcdf567c86f8b2c6173fcfb4b873e25a19 ("generic: add
>>> phys_addr_t for holding physical addresses") from the tip-core tree.
>>> This only fails if CONFIG_RELOCATABLE is set.
>>>
>>> I have applied the patch below.
>>>     
>>
>> applied to tip/core/urgent, thanks Stephen!
>>   
>
> Shouldn't this go via a ppc tree?  Won't having ppc changes in tip.git  
> make people grumpy?

it was broken via a generic topic: tip/core/resources, not the x86 tree.

	Ingo

Patch

diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index 64e1445..5ac51e6 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -10,9 +10,13 @@ 
  * 2 of the License, or (at your option) any later version.
  */
 
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+#else
+#include <asm/types.h>
+#endif
 #include <asm/asm-compat.h>
 #include <asm/kdump.h>
-#include <asm/types.h>
 
 /*
  * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software