Commit 36c25451 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 7234e2ea 8956c582
...@@ -494,6 +494,7 @@ FixupDAR:/* Entry point for dcbx workaround. */ ...@@ -494,6 +494,7 @@ FixupDAR:/* Entry point for dcbx workaround. */
bctr /* jump into table */ bctr /* jump into table */
152: 152:
mfdar r11 mfdar r11
mtdar r10
mtctr r11 /* restore ctr reg from DAR */ mtctr r11 /* restore ctr reg from DAR */
mfspr r11, SPRN_SPRG_THREAD mfspr r11, SPRN_SPRG_THREAD
stw r10, DAR(r11) stw r10, DAR(r11)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment