diff options
author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
commit | ec665af5dd517c60ea1fbe791f6c8ecc443a61b6 (patch) | |
tree | adfe7a2578ecde6d65e927afe65b289efb458ab1 /arch/powerpc/kernel/idle_book3s.S | |
parent | 46543af4c9edc5701729b24dd395c23a40871aa9 (diff) | |
parent | f952480a8fc14ea24a4de9582e425924f98c92d3 (diff) |
Merge tag 'v4.14.58' into linux-linaro-lsk-v4.14lsk-v4.14-18.07
This is the 4.14.58 stable release
Diffstat (limited to 'arch/powerpc/kernel/idle_book3s.S')
-rw-r--r-- | arch/powerpc/kernel/idle_book3s.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index e35cebd45c35..4efbde0984b2 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -140,6 +140,8 @@ power9_restore_additional_sprs: ld r4, STOP_MMCR2(r13) mtspr SPRN_MMCR1, r3 mtspr SPRN_MMCR2, r4 + ld r4, PACA_SPRG_VDSO(r13) + mtspr SPRN_SPRG3, r4 blr /* |