powerpc: Fix build issue with CONFIG_RELOCATABLE=y

There are two issues when we enable CONFIG_RELOCATABLE.  The first is due
to the fact that phys_addr_t is now defined in linux/types.h.  The second
is due to the fact that the DMA code changes expose memstart_addr to
prom_init.c

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-10-20 03:16:55 +00:00 committed by Benjamin Herrenschmidt
parent 0721357d4d
commit a3ba68f969
2 changed files with 5 additions and 2 deletions

View File

@ -12,7 +12,9 @@
#include <asm/asm-compat.h>
#include <asm/kdump.h>
#include <asm/types.h>
#ifndef __ASSEMBLY__
#include <linux/types.h>
#endif
/*
* On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
@ -73,6 +75,7 @@
#if defined(CONFIG_RELOCATABLE)
#ifndef __ASSEMBLY__
extern phys_addr_t memstart_addr;
extern phys_addr_t kernstart_addr;
#endif

View File

@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush
_end enter_prom memcpy memset reloc_offset __secondary_hold
__secondary_hold_acknowledge __secondary_hold_spinloop __start
strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
reloc_got2 kernstart_addr"
reloc_got2 kernstart_addr memstart_addr"
NM="$1"
OBJ="$2"