git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c2e31bd)
powerpc/tm: Fix GOT save offset for ABIv2
authorAnton Blanchard <anton@samba.org>
Sun, 9 Mar 2014 23:52:17 +0000 (10:52 +1100)
committerAnton Blanchard <anton@samba.org>
Wed, 23 Apr 2014 00:05:25 +0000 (10:05 +1000)
The r2 TOC/GOT save offset is 40 on ABIv1 and 24 on ABIv2.

Signed-off-by: Anton Blanchard <anton@samba.org>
arch/powerpc/include/asm/ppc_asm.h patch | blob | history
arch/powerpc/kernel/tm.S patch | blob | history

diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 3185d11..2cc2511 100644 (file)
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -190,8 +190,10 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
 #define STK_REG(i)     __STK_REG(__REG_##i)
 
 #if defined(_CALL_ELF) && _CALL_ELF == 2
+#define STK_GOT                24
 #define __STK_PARAM(i) (32 + ((i)-3)*8)
 #else
+#define STK_GOT                40
 #define __STK_PARAM(i) (48 + ((i)-3)*8)
 #endif
 #define STK_PARAM(i)   __STK_PARAM(__REG_##i)
diff --cc arch/powerpc/kernel/tm.S
Simple merge
Pandora Kernel Repository