Skip to content

Commit 7c8cb4b

Browse files
npigginmpe
authored andcommitted
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: da2bc46 ("powerpc/64s: Add new exception vector macros") Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 05af40e commit 7c8cb4b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/exceptions-64s.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ __end_interrupts:
13771377
DEFINE_FIXED_SYMBOL(__end_interrupts)
13781378

13791379
#ifdef CONFIG_PPC_970_NAP
1380-
TRAMP_REAL_BEGIN(power4_fixup_nap)
1380+
EXC_COMMON_BEGIN(power4_fixup_nap)
13811381
andc r9,r9,r10
13821382
std r9,TI_LOCAL_FLAGS(r11)
13831383
ld r10,_LINK(r1) /* make idle task do the */

0 commit comments

Comments
 (0)