From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: [folded-merged] mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix.patch removed from -mm tree Date: Wed, 03 Jun 2020 15:09:31 -0700 Message-ID: <20200603220931.wRy0KW3m0%akpm@linux-foundation.org> References: <20200602130930.8e8f10fa6f19e3766e70921f@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:50428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726354AbgFCWJd (ORCPT ); Wed, 3 Jun 2020 18:09:33 -0400 In-Reply-To: <20200602130930.8e8f10fa6f19e3766e70921f@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: bhe@redhat.com, borntraeger@de.ibm.com, linux@roeck-us.net, mm-commits@vger.kernel.org, rppt@kernel.org The patch titled Subject: Re: mm: free_area_init: allow defining max_zone_pfn in descending order has been removed from the -mm tree. Its filename was mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix.patch This patch was dropped because it was folded into mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order.patch ------------------------------------------------------ From: Mike Rapoport Subject: Re: mm: free_area_init: allow defining max_zone_pfn in descending order ARC fix Link: http://lkml.kernel.org/r/20200504153901.GM14260@kernel.org Reported-by: Guenter Roeck Cc: Baoquan He Cc: Christian Borntraeger Signed-off-by: Andrew Morton --- arch/arc/mm/init.c | 5 +++++ mm/page_alloc.c | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) --- a/arch/arc/mm/init.c~mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix +++ a/arch/arc/mm/init.c @@ -77,6 +77,11 @@ void __init early_init_dt_add_memory_arc base, TO_MB(size), !in_use ? "Not used":""); } +bool arch_has_descending_max_zone_pfns(void) +{ + return true; +} + /* * First memory setup routine called from setup_arch() * 1. setup swapper's mm @init_mm --- a/mm/page_alloc.c~mm-free_area_init-allow-defining-max_zone_pfn-in-descending-order-fix +++ a/mm/page_alloc.c @@ -7405,6 +7405,15 @@ static void check_for_memory(pg_data_t * } } +/* + * Some architecturs, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For + * such cases we allow max_zone_pfn sorted in the descending order + */ +bool __weak arch_has_descending_max_zone_pfns(void) +{ + return false; +} + /** * free_area_init - Initialise all pg_data_t and zone data * @max_zone_pfn: an array of max PFNs for each zone @@ -7422,7 +7431,7 @@ void __init free_area_init(unsigned long { unsigned long start_pfn, end_pfn; int i, nid, zone; - bool descending = false; + bool descending; /* Record where the zone boundaries are */ memset(arch_zone_lowest_possible_pfn, 0, @@ -7431,14 +7440,7 @@ void __init free_area_init(unsigned long sizeof(arch_zone_highest_possible_pfn)); start_pfn = find_min_pfn_with_active_regions();