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>
This commit is contained in:
@@ -93,7 +93,7 @@ void vpa_init(int cpu)
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_STD_MMU_64
|
||||
#ifdef CONFIG_PPC_BOOK3S_64
|
||||
/*
|
||||
* PAPR says this feature is SLB-Buffer but firmware never
|
||||
* reports that. All SPLPAR support SLB shadow buffer.
|
||||
@@ -106,7 +106,7 @@ void vpa_init(int cpu)
|
||||
"cpu %d (hw %d) of area %lx failed with %ld\n",
|
||||
cpu, hwcpu, addr, ret);
|
||||
}
|
||||
#endif /* CONFIG_PPC_STD_MMU_64 */
|
||||
#endif /* CONFIG_PPC_BOOK3S_64 */
|
||||
|
||||
/*
|
||||
* Register dispatch trace log, if one has been allocated.
|
||||
@@ -129,7 +129,7 @@ void vpa_init(int cpu)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_STD_MMU_64
|
||||
#ifdef CONFIG_PPC_BOOK3S_64
|
||||
|
||||
static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
|
||||
unsigned long vpn, unsigned long pa,
|
||||
@@ -824,7 +824,7 @@ void arch_free_page(struct page *page, int order)
|
||||
EXPORT_SYMBOL(arch_free_page);
|
||||
|
||||
#endif /* CONFIG_PPC_SMLPAR */
|
||||
#endif /* CONFIG_PPC_STD_MMU_64 */
|
||||
#endif /* CONFIG_PPC_BOOK3S_64 */
|
||||
|
||||
#ifdef CONFIG_TRACEPOINTS
|
||||
#ifdef HAVE_JUMP_LABEL
|
||||
|
Reference in New Issue
Block a user