summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2021-08-26 14:21:11 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2021-08-26 14:21:11 +0300
commit465e333e77a697fe8bfe4e24c6be1795f50c4fda (patch)
tree671506308e4c7a8b26474168e548dfd6d44e0a1c /arch/powerpc/platforms
parent806c0e6e7e97adc17389c8dc1f52d4736f49299b (diff)
parent0c8fb653d487d2873f5eefdcaf4cecff4e103828 (diff)
downloadlinux-465e333e77a697fe8bfe4e24c6be1795f50c4fda.tar.xz
Merge branch 'topic/ppc-kvm' into next
Merge some KVM patches we are keeping in a topic branch in case there are any merge conflicts that need resolving.
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/powernv/idle.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
index aa27689b832d..e3ffdc8e8567 100644
--- a/arch/powerpc/platforms/powernv/idle.c
+++ b/arch/powerpc/platforms/powernv/idle.c
@@ -667,7 +667,6 @@ static unsigned long power9_idle_stop(unsigned long psscr)
sprs.purr = mfspr(SPRN_PURR);
sprs.spurr = mfspr(SPRN_SPURR);
sprs.dscr = mfspr(SPRN_DSCR);
- sprs.wort = mfspr(SPRN_WORT);
sprs.ciabr = mfspr(SPRN_CIABR);
sprs.mmcra = mfspr(SPRN_MMCRA);
@@ -785,7 +784,6 @@ core_woken:
mtspr(SPRN_PURR, sprs.purr);
mtspr(SPRN_SPURR, sprs.spurr);
mtspr(SPRN_DSCR, sprs.dscr);
- mtspr(SPRN_WORT, sprs.wort);
mtspr(SPRN_CIABR, sprs.ciabr);
mtspr(SPRN_MMCRA, sprs.mmcra);