From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbdG1Pdi (ORCPT ); Fri, 28 Jul 2017 11:33:38 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:59356 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975AbdG1Pdh (ORCPT ); Fri, 28 Jul 2017 11:33:37 -0400 From: John Ogness To: mpe@ellerman.id.au Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] powerpc: Avoid reserving hugepages twice on PPC32 Date: Fri, 28 Jul 2017 17:33:32 +0200 Message-ID: <87d18klgoj.fsf@linutronix.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On PPC32, reserve_hugetlb_gpages() is already called in MMU_init(). Signed-off-by: John Ogness --- 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