Skip to content

Commit fd98395

Browse files
aikmpe
authored andcommitted
powerpc/64/asm: Inline BRANCH_TO_C000
It is used just once and does not really help with readability, remove it. Signed-off-by: Alexey Kardashevskiy <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f5140ca commit fd98395

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,6 @@ name:
8989
ori reg,reg,(ABS_ADDR(label))@l; \
9090
addis reg,reg,(ABS_ADDR(label))@h
9191

92-
/*
93-
* Branch to label using its 0xC000 address. This results in instruction
94-
* address suitable for MSR[IR]=0 or 1, which allows relocation to be turned
95-
* on using mtmsr rather than rfid.
96-
*
97-
* This could set the 0xc bits for !RELOCATABLE as an immediate, rather than
98-
* load KBASE for a slight optimisation.
99-
*/
100-
#define BRANCH_TO_C000(reg, label) \
101-
__LOAD_FAR_HANDLER(reg, label); \
102-
mtctr reg; \
103-
bctr
104-
10592
/*
10693
* Interrupt code generation macros
10794
*/
@@ -974,7 +961,9 @@ TRAMP_REAL_BEGIN(system_reset_idle_wake)
974961
/* We are waking up from idle, so may clobber any volatile register */
975962
cmpwi cr1,r5,2
976963
bltlr cr1 /* no state loss, return to idle caller with r3=SRR1 */
977-
BRANCH_TO_C000(r12, DOTSYM(idle_return_gpr_loss))
964+
__LOAD_FAR_HANDLER(r12, DOTSYM(idle_return_gpr_loss))
965+
mtctr r12
966+
bctr
978967
#endif
979968

980969
#ifdef CONFIG_PPC_PSERIES

0 commit comments

Comments
 (0)