diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-10-11 18:47:56 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-11 21:28:30 +1100 |
| commit | 7c8cb4b50f3cc6f4a8f7bfddad6fb5a845df3261 (patch) | |
| tree | 9cd41e64baced76df684b8876222185eec50a015 /arch/powerpc | |
| parent | 05af40e885955065aee8bb7425058eb3e1adca08 (diff) | |
| download | linux-stable-7c8cb4b50f3cc6f4a8f7bfddad6fb5a845df3261.tar.gz linux-stable-7c8cb4b50f3cc6f4a8f7bfddad6fb5a845df3261.tar.bz2 linux-stable-7c8cb4b50f3cc6f4a8f7bfddad6fb5a845df3261.zip | |
powerpc/64s: Fix power4_fixup_nap placement
power4_fixup_nap is called from the "common" handlers, not the virt/real
handlers, therefore it should itself be a common handler. Placing it
down in the trampoline space caused it to go out of reach of its
callers, requiring a trampoline inserted at the start of the text
section, which breaks the fixed section address calculations.
Fixes: da2bc4644c75 ("powerpc/64s: Add new exception vector macros")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 08992f8f5036..f129408c6022 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1377,7 +1377,7 @@ __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) #ifdef CONFIG_PPC_970_NAP -TRAMP_REAL_BEGIN(power4_fixup_nap) +EXC_COMMON_BEGIN(power4_fixup_nap) andc r9,r9,r10 std r9,TI_LOCAL_FLAGS(r11) ld r10,_LINK(r1) /* make idle task do the */ |