summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/dt_cpu_ftrs.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-12 16:38:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-12 16:38:35 -0700
commit5aff29efbec020f0997e5cdbefce0ff383518986 (patch)
tree8b7df95c23b3cd2cfa17873ff0fa999dd5ae35bd /arch/powerpc/kernel/dt_cpu_ftrs.c
parent9bd034225300c7ddf14f4b4c28531efc7a5e1524 (diff)
parent3ef8a2eeb6dcd1fa61ec8ae107976e655f50e412 (diff)
Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next
Bring in xen-kbdfront changes.
Diffstat (limited to 'arch/powerpc/kernel/dt_cpu_ftrs.c')
-rw-r--r--arch/powerpc/kernel/dt_cpu_ftrs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c
index 8ab51f6ca03a..c904477abaf3 100644
--- a/arch/powerpc/kernel/dt_cpu_ftrs.c
+++ b/arch/powerpc/kernel/dt_cpu_ftrs.c
@@ -101,6 +101,7 @@ static void __restore_cpu_cpufeatures(void)
if (hv_mode) {
mtspr(SPRN_LPID, 0);
mtspr(SPRN_HFSCR, system_registers.hfscr);
+ mtspr(SPRN_PCR, 0);
}
mtspr(SPRN_FSCR, system_registers.fscr);