From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 5 May 2014 10:33:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'anton/abiv2' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f6869e7fe657bd977e72954cd78c5871a6a4f71d;p=deliverable%2Flinux.git

Merge remote-tracking branch 'anton/abiv2' into next

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.
---

f6869e7fe657bd977e72954cd78c5871a6a4f71d
diff --cc arch/powerpc/lib/memcpy_64.S
index dc4ba7953b92,bc9a2ca591c3..32a06ec395d2
--- a/arch/powerpc/lib/memcpy_64.S
+++ b/arch/powerpc/lib/memcpy_64.S
@@@ -10,13 -10,9 +10,13 @@@
  #include <asm/ppc_asm.h>
  
  	.align	7
- _GLOBAL(memcpy)
+ _GLOBAL_TOC(memcpy)
  BEGIN_FTR_SECTION
 +#ifdef __LITTLE_ENDIAN__
 +	cmpdi	cr7,r5,0
 +#else
- 	std	r3,48(r1)	/* save destination pointer for return value */
+ 	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
diff --cc arch/powerpc/platforms/powernv/smp.c
index bf5fcd452168,b370b86263a6..1601a1ea02c4
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@@ -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"