diff options
author | Anton Blanchard <anton@samba.org> | 2014-04-03 01:01:11 -0400 |
---|---|---|
committer | Anton Blanchard <anton@samba.org> | 2014-04-22 20:05:32 -0400 |
commit | 169c7cee3131cdf5e2f2d2a6c722c7db0283bcd5 (patch) | |
tree | a9804c62b8090d719337159fd98294b9282209cf /arch/powerpc/lib | |
parent | 008d7a914efee6ee5afe59bcc46d3d6b60657598 (diff) |
powerpc: Add _GLOBAL_TOC for ABIv2 assembly functions exported to modules
If an assembly function that calls back into c code is exported to
modules, we need to ensure r2 is setup correctly. There are only
two places crazy enough to do it (two of which are my fault).
Signed-off-by: Anton Blanchard <anton@samba.org>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r-- | arch/powerpc/lib/copyuser_64.S | 2 | ||||
-rw-r--r-- | arch/powerpc/lib/memcpy_64.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S index 596a285c0755..0860ee46013c 100644 --- a/arch/powerpc/lib/copyuser_64.S +++ b/arch/powerpc/lib/copyuser_64.S | |||
@@ -18,7 +18,7 @@ | |||
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | .align 7 | 20 | .align 7 |
21 | _GLOBAL(__copy_tofrom_user) | 21 | _GLOBAL_TOC(__copy_tofrom_user) |
22 | BEGIN_FTR_SECTION | 22 | BEGIN_FTR_SECTION |
23 | nop | 23 | nop |
24 | FTR_SECTION_ELSE | 24 | FTR_SECTION_ELSE |
diff --git a/arch/powerpc/lib/memcpy_64.S b/arch/powerpc/lib/memcpy_64.S index 9d3960c16fde..bc9a2ca591c3 100644 --- a/arch/powerpc/lib/memcpy_64.S +++ b/arch/powerpc/lib/memcpy_64.S | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <asm/ppc_asm.h> | 10 | #include <asm/ppc_asm.h> |
11 | 11 | ||
12 | .align 7 | 12 | .align 7 |
13 | _GLOBAL(memcpy) | 13 | _GLOBAL_TOC(memcpy) |
14 | BEGIN_FTR_SECTION | 14 | BEGIN_FTR_SECTION |
15 | std r3,-STACKFRAMESIZE+STK_REG(R31)(r1) /* save destination pointer for return value */ | 15 | std r3,-STACKFRAMESIZE+STK_REG(R31)(r1) /* save destination pointer for return value */ |
16 | FTR_SECTION_ELSE | 16 | FTR_SECTION_ELSE |