From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755171AbbLaK6y (ORCPT ); Thu, 31 Dec 2015 05:58:54 -0500 Received: from ozlabs.org ([103.22.144.67]:60304 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215AbbLaK6v (ORCPT ); Thu, 31 Dec 2015 05:58:51 -0500 Date: Thu, 31 Dec 2015 21:58:49 +1100 From: Stephen Rothwell To: Andrew Morton , Jonathan Corbet Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Elliott , Taku Izumi Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree Message-ID: <20151231215849.01be6998@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: 9daacf51b428 ("Documentation/kernel-parameters: update KMG units") from the jc_docs tree and commit: f0a906868be1 ("mm/page_alloc.c: introduce kernelcore=mirror option") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc mm/page_alloc.c index 13cf824f6d23,72218a4adab9..000000000000 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@@ -5500,7 -5718,37 +5718,37 @@@ static void __init find_zone_movable_pf } /* + * If kernelcore=mirror is specified, ignore movablecore option + */ + if (mirrored_kernelcore) { + bool mem_below_4gb_not_mirrored = false; + + for_each_memblock(memory, r) { + if (memblock_is_mirror(r)) + continue; + + nid = r->nid; + + usable_startpfn = memblock_region_memory_base_pfn(r); + + if (usable_startpfn < 0x100000) { + mem_below_4gb_not_mirrored = true; + continue; + } + + zone_movable_pfn[nid] = zone_movable_pfn[nid] ? + min(usable_startpfn, zone_movable_pfn[nid]) : + usable_startpfn; + } + + if (mem_below_4gb_not_mirrored) + pr_warn("This configuration results in unmirrored kernel memory."); + + goto out2; + } + + /* - * If movablecore=nn[KMG] was specified, calculate what size of + * If movablecore=nn[KMGTPE] was specified, calculate what size of * kernelcore that corresponds so that memory usable for * any allocation type is evenly spread. If both kernelcore * and movablecore are specified, then the value of kernelcore