Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c8cb4b5 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: da2bc464 ("powerpc/64s: Add new exception vector macros")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 05af40e8

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */