Skip to content

Commit f30a5e6

Browse files
npigginmpe
authored andcommitted
powerpc/tm: update comment about interrupt re-entrancy
Since the system reset interrupt began to use its own stack, and machine check interrupts have done so for some time, r1 can be changed without clearing MSR[RI], provided no other interrupts (including SLB misses) are taken. MSR[RI] does have to be cleared when using SCRATCH0, however. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent d7fb34c commit f30a5e6

File tree

1 file changed

+2
-2
lines changed
  • arch/powerpc/kernel

1 file changed

+2
-2
lines changed

arch/powerpc/kernel/tm.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ _GLOBAL(tm_reclaim)
148148
/* Stash the stack pointer away for use after reclaim */
149149
std r1, PACAR1(r13)
150150

151-
/* Clear MSR RI since we are about to change r1, EE is already off. */
151+
/* Clear MSR RI since we are about to use SCRATCH0, EE is already off */
152152
li r5, 0
153153
mtmsrd r5, 1
154154

@@ -474,7 +474,7 @@ restore_gprs:
474474

475475
REST_GPR(7, r7)
476476

477-
/* Clear MSR RI since we are about to change r1. EE is already off */
477+
/* Clear MSR RI since we are about to use SCRATCH0. EE is already off */
478478
li r5, 0
479479
mtmsrd r5, 1
480480

0 commit comments

Comments
 (0)