Skip to content

Commit 36c2545

Browse files
committed
Merge tag 'powerpc-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman: - Fix crash in memcpy on 8xx due to dcbz workaround since recent changes Thanks to Christophe Leroy. * tag 'powerpc-6.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/8xx: Fix kernel DTLB miss on dcbz
2 parents 7234e2e + 8956c58 commit 36c2545

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/powerpc/kernel/head_8xx.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ FixupDAR:/* Entry point for dcbx workaround. */
494494
bctr /* jump into table */
495495
152:
496496
mfdar r11
497+
mtdar r10
497498
mtctr r11 /* restore ctr reg from DAR */
498499
mfspr r11, SPRN_SPRG_THREAD
499500
stw r10, DAR(r11)

0 commit comments

Comments
 (0)