diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-05 20:33:10 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-05 20:57:12 +1000 |
| commit | f6869e7fe657bd977e72954cd78c5871a6a4f71d (patch) | |
| tree | 1e34a4bb36cde4b541d7344599e65b541bb4bee7 /arch/powerpc/platforms/powernv/opal-wrappers.S | |
| parent | 5a4e58bc693f04aa650219784e5e339e0db6b902 (diff) | |
| parent | cec4b7eaf09d330e94e8e94133d360e6f1855974 (diff) | |
| download | talos-obmc-linux-f6869e7fe657bd977e72954cd78c5871a6a4f71d.tar.gz talos-obmc-linux-f6869e7fe657bd977e72954cd78c5871a6a4f71d.zip | |
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.
Diffstat (limited to 'arch/powerpc/platforms/powernv/opal-wrappers.S')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-wrappers.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S index f531ffe35b3e..b5ebc545a373 100644 --- a/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -32,7 +32,7 @@ std r12,PACASAVEDMSR(r13); \ andc r12,r12,r0; \ mtmsrd r12,1; \ - LOAD_REG_ADDR(r0,.opal_return); \ + LOAD_REG_ADDR(r0,opal_return); \ mtlr r0; \ li r0,MSR_DR|MSR_IR|MSR_LE;\ andc r12,r12,r0; \ @@ -44,7 +44,7 @@ mtspr SPRN_HSRR0,r12; \ hrfid -_STATIC(opal_return) +opal_return: /* * Fixup endian on OPAL return... we should be able to simplify * this by instead converting the below trampoline to a set of |
