powerpc: fix linux-next build failure
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Oct 2008 09:29:07 +0000 (20:29 +1100)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Oct 2008 10:38:19 +0000 (12:38 +0200)
commit463baa8a0947f858d6db1c56d87eeaf1176ba7bb
tree201c52793d69a82ade7227031f9f9f5079bf29cf
parent278429cff8809958d25415ba0ed32b59866ab1a8
powerpc: fix linux-next build failure

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.

So include that instead of asm/types.h in asm/page.h for
the CONFIG_RELOCATABLE case.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: ppc-dev <linuxppc-dev@ozlabs.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/powerpc/include/asm/page.h