summaryrefslogtreecommitdiff
path: root/arch/powerpc/mm/dump_hashpagetable.c
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-10-19 15:08:43 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2017-11-06 16:48:14 +1100
commit4e003747043d57aa75c9762fa148ef38afe68dd8 (patch)
treea9dc99de8961b4b66ab0ac84d0923dde198ded92 /arch/powerpc/mm/dump_hashpagetable.c
parentc1807e3f84668c4c1e838386fdc3f6e63df1156c (diff)
downloadlinux-4e003747043d57aa75c9762fa148ef38afe68dd8.tar.gz
powerpc/64s: Replace CONFIG_PPC_STD_MMU_64 with CONFIG_PPC_BOOK3S_64
CONFIG_PPC_STD_MMU_64 indicates support for the "standard" powerpc MMU on 64-bit CPUs. The "standard" MMU refers to the hash page table MMU found in "server" processors, from IBM mainly. Currently CONFIG_PPC_STD_MMU_64 is == CONFIG_PPC_BOOK3S_64. While it's annoying to have two symbols that always have the same value, it's not quite annoying enough to bother removing one. However with the arrival of Power9, we now have the situation where CONFIG_PPC_STD_MMU_64 is enabled, but the kernel is running using the Radix MMU - *not* the "standard" MMU. So it is now actively confusing to use it, because it implies that code is disabled or inactive when the Radix MMU is in use, however that is not necessarily true. So s/CONFIG_PPC_STD_MMU_64/CONFIG_PPC_BOOK3S_64/, and do some minor formatting updates of some of the affected lines. This will be a pain for backports, but c'est la vie. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/dump_hashpagetable.c')
-rw-r--r--arch/powerpc/mm/dump_hashpagetable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/dump_hashpagetable.c b/arch/powerpc/mm/dump_hashpagetable.c
index 5c4c93dcff19..14cfb11b09d0 100644
--- a/arch/powerpc/mm/dump_hashpagetable.c
+++ b/arch/powerpc/mm/dump_hashpagetable.c
@@ -500,7 +500,7 @@ static void populate_markers(void)
address_markers[6].start_address = PHB_IO_END;
address_markers[7].start_address = IOREMAP_BASE;
address_markers[8].start_address = IOREMAP_END;
-#ifdef CONFIG_PPC_STD_MMU_64
+#ifdef CONFIG_PPC_BOOK3S_64
address_markers[9].start_address = H_VMEMMAP_BASE;
#else
address_markers[9].start_address = VMEMMAP_BASE;