diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
commit | ec84f0056711efe93f034c86dd65e0de8d3531ff (patch) | |
tree | 3e50d385d645487924bcac1f5fb33b496cda6dc0 /arch/powerpc/mm/pgtable-radix.c | |
parent | d03266910a533d874c01ef2ca8dc73009f2925fa (diff) | |
parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
download | op-kernel-dev-ec84f0056711efe93f034c86dd65e0de8d3531ff.zip op-kernel-dev-ec84f0056711efe93f034c86dd65e0de8d3531ff.tar.gz |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/mm/pgtable-radix.c')
-rw-r--r-- | arch/powerpc/mm/pgtable-radix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index ed7bddc..688b545 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -388,6 +388,10 @@ void radix__early_init_mmu_secondary(void) * update partition table control register and UPRT */ if (!firmware_has_feature(FW_FEATURE_LPAR)) { + + if (cpu_has_feature(CPU_FTR_POWER9_DD1)) + update_hid_for_radix(); + lpcr = mfspr(SPRN_LPCR); mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); |