Merge remote-tracking branch 'anton/abiv2' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 5 May 2014 10:33:10 +0000 (20:33 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 5 May 2014 10:57:12 +0000 (20:57 +1000)
This series adds support for building the powerpc 64-bit
LE kernel using the new ABI v2. We already supported
running ABI v2 userspace programs but this adds support
for building the kernel itself using the new ABI.

1  2 
arch/powerpc/Makefile
arch/powerpc/kernel/tm.S
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/lib/memcpy_64.S
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/slb_low.S
arch/powerpc/platforms/powernv/smp.c

Simple merge
Simple merge
index dc4ba7953b9223af451dab4b7e4997fcaba8afd0,bc9a2ca591c3b20ff772a5551d5901b9933a0728..32a06ec395d2108202762c6d164b3994ca6a7644
  #include <asm/ppc_asm.h>
  
        .align  7
- _GLOBAL(memcpy)
+ _GLOBAL_TOC(memcpy)
  BEGIN_FTR_SECTION
-       std     r3,48(r1)       /* save destination pointer for return value */
 +#ifdef __LITTLE_ENDIAN__
 +      cmpdi   cr7,r5,0
 +#else
+       std     r3,-STACKFRAMESIZE+STK_REG(R31)(r1)     /* save destination pointer for return value */
 +#endif
  FTR_SECTION_ELSE
  #ifndef SELFTEST
        b       memcpy_power7
@@@ -216,6 -201,5 +216,6 @@@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED
  3:    bf      cr7*4+3,4f
        lbz     r0,0(r4)
        stb     r0,0(r3)
- 4:    ld      r3,48(r1)       /* return dest pointer */
+ 4:    ld      r3,-STACKFRAMESIZE+STK_REG(R31)(r1)     /* return dest pointer */
        blr
 +#endif
Simple merge
Simple merge
index bf5fcd452168c6056492115c0232b40f25a2e407,b370b86263a6181b068ab18eeb60e6d730462f77..1601a1ea02c4322cbc53f21d00b6f56c039e2276
@@@ -30,7 -30,7 +30,8 @@@
  #include <asm/cputhreads.h>
  #include <asm/xics.h>
  #include <asm/opal.h>
 +#include <asm/runlatch.h>
+ #include <asm/code-patching.h>
  
  #include "powernv.h"