Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3ba68f9 authored by Kumar Gala's avatar Kumar Gala Committed by Benjamin Herrenschmidt
Browse files

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: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 0721357d

arch/powerpc/include/asm/page.h

+4 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/prom_init_check.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"