diff options
author | Michael Ellerman | 2017-02-14 07:18:29 +0100 |
---|---|---|
committer | Michael Ellerman | 2017-02-14 07:18:29 +0100 |
commit | da0e7e6276968fcc61ac7484d0026cd5fdd94dc3 (patch) | |
tree | 79a03731cca75ab4a41e7e7162288b22150811a3 /arch/powerpc/mm/pgtable-radix.c | |
parent | powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y (diff) | |
parent | powerpc/powernv: Remove separate entry for OPAL real mode calls (diff) | |
download | kernel-qcow2-linux-da0e7e6276968fcc61ac7484d0026cd5fdd94dc3.tar.gz kernel-qcow2-linux-da0e7e6276968fcc61ac7484d0026cd5fdd94dc3.tar.xz kernel-qcow2-linux-da0e7e6276968fcc61ac7484d0026cd5fdd94dc3.zip |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we're sharing with the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/mm/pgtable-radix.c')
-rw-r--r-- | arch/powerpc/mm/pgtable-radix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index 30374586e01d..de81b5e3b2f2 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -414,6 +414,8 @@ void __init radix__early_init_mmu(void) mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); radix_init_partition_table(); radix_init_amor(); + } else { + radix_init_pseries(); } memblock_set_current_limit(MEMBLOCK_ALLOC_ANYWHERE); |