diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-10-22 11:32:52 +0800 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-23 13:57:18 +1100 |
| commit | 19d36c2152aaf093c97431b5b4d13d29305a63a3 (patch) | |
| tree | d6759e21e780d7c9247e287380cf17a9ab206e7e | |
| parent | fcbb539f279f7d854bd49819b889fea0612909f8 (diff) | |
| download | linux-19d36c2152aaf093c97431b5b4d13d29305a63a3.tar.bz2 | |
powernv: Use _GLOBAL_TOC for opal wrappers
Currently, we can't call opal wrappers from modules when using the LE
ABIv2, which requires a TOC init. If we do we'll try and load the opal
entry point using the wrong toc and probably explode or worse jump to
the wrong address.
Nothing in upstream is making opal calls from a module, but we do export
one of the wrappers so we should fix this anyway.
This change uses the _GLOBAL_TOC() macro (rather than _GLOBAL) for the
opal wrappers, so that we can do non-local calls to them.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-wrappers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S index e9e2450c1fdd..feb549aa3eea 100644 --- a/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -58,7 +58,7 @@ END_FTR_SECTION(0, 1); \ */ #define OPAL_CALL(name, token) \ - _GLOBAL(name); \ + _GLOBAL_TOC(name); \ mflr r0; \ std r0,16(r1); \ li r0,token; \ |