[PATCH 1/5] powerpc: consolidate feature fixup code

Benjamin Herrenschmidt benh at kernel.crashing.org
Mon Oct 16 14:51:26 EST 2006


On Fri, 2006-10-13 at 18:04 +1000, Benjamin Herrenschmidt wrote:
>  
> Index: linux-cell/include/asm-powerpc/system.h
> ===================================================================
> --- linux-cell.orig/include/asm-powerpc/system.h        2006-10-06 13:48:24.000000000 +1000
> +++ linux-cell/include/asm-powerpc/system.h     2006-10-13 16:24:45.000000000 +1000
> @@ -378,7 +378,11 @@ extern unsigned long reloc_offset(void);
>  extern unsigned long add_reloc_offset(unsigned long);
>  extern void reloc_got2(unsigned long);
>  
> +#ifdef CONFIG_PPC64
> +#define PTRRELOC(x)    x
> +#else
>  #define PTRRELOC(x)    ((typeof(x)) add_reloc_offset((unsigned long)(x)))
> +#endif
>  
>  static inline void create_instruction(unsigned long addr, unsigned int instr)
>  {

And of course that bit of the patch is a stupid "optimisation" that
breaks prom_init.c on ppc64... I'll post a new patch without it and do
more tests (damn, I tested iSeries and figured if it worked there, it
would work everywhere :)

Ben.





More information about the Linuxppc-dev mailing list