diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-13 02:16:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-13 02:16:21 +0200 |
| commit | 36c254515dc6592c44db77b84908358979dd6b50 (patch) | |
| tree | 3e9d74dcef89b3f04342fb79a4ecfa593086c60f | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| parent | powerpc/8xx: Fix kernel DTLB miss on dcbz (diff) | |
| download | linux-36c254515dc6592c44db77b84908358979dd6b50.tar.xz linux-36c254515dc6592c44db77b84908358979dd6b50.zip | |
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
| -rw-r--r-- | arch/powerpc/kernel/head_8xx.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 811a7130505c..56c5ebe21b99 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -494,6 +494,7 @@ FixupDAR:/* Entry point for dcbx workaround. */ bctr /* jump into table */ 152: mfdar r11 + mtdar r10 mtctr r11 /* restore ctr reg from DAR */ mfspr r11, SPRN_SPRG_THREAD stw r10, DAR(r11) |