[PATCH] powerpc: Avoid reserving hugepages twice on PPC32

From: John Ogness
Date: Fri Jul 28 2017 - 11:33:56 EST


On PPC32, reserve_hugetlb_gpages() is already called in MMU_init().

Signed-off-by: John Ogness <john.ogness@xxxxxxxxxxxxx>
---
arch/powerpc/kernel/setup-common.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 94a9482..1d5d2de 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -920,8 +920,11 @@ void __init setup_arch(char **cmdline_p)
* Reserve any gigantic pages requested on the command line.
* memblock needs to have been initialized by the time this is
* called since this will reserve memory.
+ * (PPC32 did this already in MMU_init())
*/
+#ifdef CONFIG_PPC64
reserve_hugetlb_gpages();
+#endif

klp_init_thread_info(&init_thread_info);

--
1.7.10.4