From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E87F2C433DF for ; Fri, 16 Oct 2020 03:09:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9857020E65 for ; Fri, 16 Oct 2020 03:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602817754; bh=hhD66k9L/inqWUFfzvQU1C8LXHeTy5yfWongm6UrHCU=; h=Date:From:To:Subject:In-Reply-To:Reply-To:List-ID:From; b=y2q4kAstx80KX1Wwd8bUN/aE8ep0EY2Zdzs9VBbF6bE8ci/MuFtgppcZZjo2iplAG vqkHNVBUjYkSfoNND+hH6H7b6bSBu19SLkqQKFY0P8FBMZIMaDRWQKKdzA3FViuZqh RpsIPjdUEtg0zK8CVEoTVGq6Of/G0ES9xFig+Hac= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732460AbgJPDJO (ORCPT ); Thu, 15 Oct 2020 23:09:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:46784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726528AbgJPDJO (ORCPT ); Thu, 15 Oct 2020 23:09:14 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA2C820FC3; Fri, 16 Oct 2020 03:09:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602817753; bh=hhD66k9L/inqWUFfzvQU1C8LXHeTy5yfWongm6UrHCU=; h=Date:From:To:Subject:In-Reply-To:From; b=RWDAqbAxMzdcAXEj3x2P9ckXjDmBH5kMT5tlFR3ZceTBg3e/LFGa0K8m4Z3idt+fw u2o3Nd+T+ylFaKTTvtG+RbGVj3rcG1KfiNxHszQ0M/h40oOGH6VK7cz5+GGLpGlmKN suOG4S3fQ2xFm4eNuYr4yispxb/wW2ql2wMT1C9A= Date: Thu, 15 Oct 2020 20:09:12 -0700 From: Andrew Morton To: akpm@linux-foundation.org, ardb@kernel.org, bhe@redhat.com, dan.j.williams@intel.com, david@redhat.com, jgg@ziepe.ca, keescook@chromium.org, mhocko@suse.com, mm-commits@vger.kernel.org, pankaj.gupta.linux@gmail.com, richard.weiyang@linux.alibaba.com, torvalds@linux-foundation.org Subject: [patch 077/156] kernel/resource: make iomem_resource implicit in release_mem_region_adjustable() Message-ID: <20201016030912.6Q2B27cmQ%akpm@linux-foundation.org> In-Reply-To: <20201015194043.84cda0c1d6ca2a6847f2384a@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org From: David Hildenbrand Subject: kernel/resource: make iomem_resource implicit in release_mem_region_adjustable() "mem" in the name already indicates the root, similar to release_mem_region() and devm_request_mem_region(). Make it implicit. The only single caller always passes iomem_resource, other parents are not applicable. Link: https://lkml.kernel.org/r/20200916073041.10355-1-david@redhat.com Signed-off-by: David Hildenbrand Suggested-by: Wei Yang Reviewed-by: Wei Yang Cc: Michal Hocko Cc: Dan Williams Cc: Jason Gunthorpe Cc: Kees Cook Cc: Ard Biesheuvel Cc: Pankaj Gupta Cc: Baoquan He Signed-off-by: Andrew Morton --- include/linux/ioport.h | 3 +-- kernel/resource.c | 5 ++--- mm/memory_hotplug.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) --- a/include/linux/ioport.h~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +++ a/include/linux/ioport.h @@ -251,8 +251,7 @@ extern struct resource * __request_regio extern void __release_region(struct resource *, resource_size_t, resource_size_t); #ifdef CONFIG_MEMORY_HOTREMOVE -extern void release_mem_region_adjustable(struct resource *, resource_size_t, - resource_size_t); +extern void release_mem_region_adjustable(resource_size_t, resource_size_t); #endif #ifdef CONFIG_MEMORY_HOTPLUG extern void merge_system_ram_resource(struct resource *res); --- a/kernel/resource.c~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +++ a/kernel/resource.c @@ -1240,7 +1240,6 @@ EXPORT_SYMBOL(__release_region); #ifdef CONFIG_MEMORY_HOTREMOVE /** * release_mem_region_adjustable - release a previously reserved memory region - * @parent: parent resource descriptor * @start: resource start address * @size: resource region size * @@ -1258,9 +1257,9 @@ EXPORT_SYMBOL(__release_region); * assumes that all children remain in the lower address entry for * simplicity. Enhance this logic when necessary. */ -void release_mem_region_adjustable(struct resource *parent, - resource_size_t start, resource_size_t size) +void release_mem_region_adjustable(resource_size_t start, resource_size_t size) { + struct resource *parent = &iomem_resource; struct resource *new_res = NULL; bool alloc_nofail = false; struct resource **p; --- a/mm/memory_hotplug.c~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +++ a/mm/memory_hotplug.c @@ -1767,7 +1767,7 @@ static int __ref try_remove_memory(int n memblock_remove(start, size); } - release_mem_region_adjustable(&iomem_resource, start, size); + release_mem_region_adjustable(start, size); try_offline_node(nid); _