From patchwork Tue Jan 5 05:49:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 7952781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE28D9F38D for ; Tue, 5 Jan 2016 05:51:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE5622037F for ; Tue, 5 Jan 2016 05:51:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E926D201CD for ; Tue, 5 Jan 2016 05:51:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGKVh-0001dI-JK; Tue, 05 Jan 2016 05:50:21 +0000 Received: from mail.linuxfoundation.org ([140.211.169.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGKVe-0000QZ-ND for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2016 05:50:19 +0000 Received: from localhost (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 579FDEC0; Tue, 5 Jan 2016 05:49:57 +0000 (UTC) Date: Mon, 4 Jan 2016 21:49:44 -0800 From: Andrew Morton To: Stephen Rothwell Subject: Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()" Message-Id: <20160104214944.8cafbcef.akpm@linux-foundation.org> In-Reply-To: <20160105164716.44b9db6d@canb.auug.org.au> References: <20160104224233.GU16023@sirena.org.uk> <20160104150946.373ed02b8e8b81221340b7c8@linux-foundation.org> <20160104235512.GW16023@sirena.org.uk> <20160104163528.be56a4b1.akpm@linux-foundation.org> <20160105114918.2641f95d@canb.auug.org.au> <20160105164716.44b9db6d@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160104_215018_801539_A04CFEE4 X-CRM114-Status: GOOD ( 14.83 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Tony Luck , Russell King , kernel-build-reports@lists.linaro.org, Mel Gorman , Tyler.Baker@linaro.org, Dave Hansen , Kevin.Hilman@linaro.org, Mark Brown , Kamezawa Hiroyuki , Xishi Qiu , Taku Izumi , linux-next@vger.kernel.org, Matt Fleming Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 5 Jan 2016 16:47:16 +1100 Stephen Rothwell wrote: > Hi Andrew, > > On Tue, 5 Jan 2016 11:49:18 +1100 Stephen Rothwell wrote: > > > > On Mon, 4 Jan 2016 16:35:28 -0800 Andrew Morton wrote: > > > > > > Stephen, can we please retain > > > > > > mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch > > > mm-introduce-kernelcore=mirror-option.patch > > > mm-introduce-kernelcore=mirror-option-fix.patch > > > mm-introduce-kernelcore=mirror-option-fix-2.patch > > > > > > and add the below? > > > > Sure, that is easier than dropping the above patches, anyway. > > I have done that *except* that > mm-introduce-kernelcore=mirror-option-fix-2.patch is not in mmotm and I > cannot find it anywhere. oops sorry, I took it out so it isn't in today's http://ozlabs.org/~akpm/mmots/broken-out/. Here: From: Arnd Bergmann Subject: mm: avoid unused variables in memmap_init_zone A quick fix on mm/page_alloc.c introduced a harmless warning: mm/page_alloc.c: In function 'memmap_init_zone': mm/page_alloc.c:4617:44: warning: unused variable 'tmp' [-Wunused-variable] mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable] This uses another #ifdef to avoid declaring the two variables when the code is not built. Signed-off-by: Arnd Bergmann Cc: Taku Izumi Cc: Tony Luck Signed-off-by: Andrew Morton --- mm/page_alloc.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN mm/page_alloc.c~mm-introduce-kernelcore=mirror-option-fix-2 mm/page_alloc.c --- a/mm/page_alloc.c~mm-introduce-kernelcore=mirror-option-fix-2 +++ a/mm/page_alloc.c @@ -4465,7 +4465,9 @@ void __meminit memmap_init_zone(unsigned unsigned long pfn; struct zone *z; unsigned long nr_initialised = 0; +#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP struct memblock_region *r = NULL, *tmp; +#endif if (highest_memmap_pfn < end_pfn - 1) highest_memmap_pfn = end_pfn - 1;