From patchwork Wed Sep 5 15:59:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10589163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 629995A4 for ; Wed, 5 Sep 2018 16:02:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 574E02A720 for ; Wed, 5 Sep 2018 16:02:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5536D2A6C4; Wed, 5 Sep 2018 16:02:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C38632A831 for ; Wed, 5 Sep 2018 16:02:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52AD66B7407; Wed, 5 Sep 2018 12:02:10 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4D9426B740E; Wed, 5 Sep 2018 12:02:10 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 353546B7407; Wed, 5 Sep 2018 12:02:10 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by kanga.kvack.org (Postfix) with ESMTP id 0DCB96B7437 for ; Wed, 5 Sep 2018 12:02:09 -0400 (EDT) Received: by mail-oi0-f71.google.com with SMTP id b8-v6so9217914oib.4 for ; Wed, 05 Sep 2018 09:02:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=J2h0id62nYkjkKXBm+dOjCpeM8S9zp9q0KhpE83j0x4=; b=YNmwQyP5poGq7MhBBENSHfeyhUUm+oy9t1XLe0zy2dqSa6/m2Ijpe2IIjRuqYS0Uvc 36ZY5PDwPoymJHlmt6HqyOk9Z+Jnhez790oeJuM6ZH8oQv4PpJvx9X+/sqBu8Nm7kWDf 9OBOIiZ82oGGVAA5350ng2agDK/3m8f3fmvQEbi5zwEPdDZuRoymC37uWw6WLBNMTtYi sV3Ah2N49ZTf8woRwnMmHX0et04iVEild1f8v21fuYf1d9T0Uc5XqHKx+3q+RXdbO9UK 0lr/MjqhSG0zLTtK0DZnOZ0qQIsGJep6k5cseQdU5aGRek+NIAnvt0u8JGuteVdC7klz l/2Q== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APzg51C6JllT89M95R8XhhAK/22s4fQk2rT6IaKa1qztOAGRan4bbtgK YaZetvC9MSqQPnrpckdB53HYrlB006Dik7K4nXaMki63Q4mx12R5tU3tMSEyNwDVjxyHLeYjM2w NmvpZP3K5Ttpu8BjwtVSHfG9EttGTUUVifjPKRpzahfwkSLWJn/4cTJHYh/0HqS4= X-Received: by 2002:aca:3357:: with SMTP id z84-v6mr29738276oiz.49.1536163328837; Wed, 05 Sep 2018 09:02:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZy3pGnCMXNH0cjO6MetVJO5DoIS4LiwgbJiZt/bAoqq6A64kKj3Dibic9cL3CHH3UdcZRu X-Received: by 2002:aca:3357:: with SMTP id z84-v6mr29738226oiz.49.1536163328051; Wed, 05 Sep 2018 09:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536163328; cv=none; d=google.com; s=arc-20160816; b=KmMgwJ1KEGljGsx22PipY5YKFiNOeZ4bFun9SJzdv4BDt7xnvUnKUY7/WoIUziqSqI yobApfi6Ta67yTgQic463ToO0o+o1VFMMqlsCxBEIIxicNH4r/QdMVIpi+QU/RsqKsj0 JeybToN5Pb9M3HEsc+GK6Kny5AR7lHzFAc1TeW6XPoDwQK9FwMxKy5yrV8IO76f7zcE+ +tDjtQaNkXdDSECPaDweVpC2QTPMgWtl+UvKFkQrPDZXQ0eUqlUX9ObzLDagqBopGfNc XwtaSNcFTTns87DhT8NCO/l1ZA+1LlDN4HDGgdq5mMmjBaiIhdTNNx4jjCRL4LB65sNZ nfZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from; bh=J2h0id62nYkjkKXBm+dOjCpeM8S9zp9q0KhpE83j0x4=; b=Jhpj6hq97Oc3rLfIBKHz7Ri8VJOrXBRxAmkB4FtrfkDcng7YcwOCr30vMnrqRG0TDP uhlfu93DzMqw7zK3GzzBbxgZMeXkfGU0dLtNvsnyB13US/I3RP6zE3u2YP3B2umAM6Vp KWA0Hs4NAnv1SDw56sB4Pe+45ezanmMQEc8wnrkIDpDcdd959pEAJnPO9bLtp3hIxf+P H8pp/P64pCCtxQb3INwoiF6BxLM9tSXNg3AkIwxLGhx+TCSXQz0Y3a+9SCUtcX32luw2 QFKJf2Rx+M6UoSxykyjQNxBGJghCT8XYoyN2yaa/BmCtwba47aZEf4dDPuG0kFjcdDDL VnQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id c18-v6si1436824oiy.298.2018.09.05.09.02.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 09:02:08 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w85FuBFp033765 for ; Wed, 5 Sep 2018 12:02:07 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mafkfgmsf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 05 Sep 2018 12:01:37 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Sep 2018 17:01:05 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 5 Sep 2018 17:01:00 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w85G0xpf12386388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 5 Sep 2018 16:00:59 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 500E5AE045; Wed, 5 Sep 2018 19:00:22 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 39A14AE056; Wed, 5 Sep 2018 19:00:20 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.92]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 5 Sep 2018 19:00:20 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 05 Sep 2018 19:00:57 +0300 From: Mike Rapoport To: linux-mm@kvack.org Cc: Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Ingo Molnar , Michael Ellerman , Michal Hocko , Paul Burton , Thomas Gleixner , Tony Luck , linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [RFC PATCH 26/29] memblock: rename __free_pages_bootmem to memblock_free_pages Date: Wed, 5 Sep 2018 18:59:41 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1536163184-26356-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18090516-0012-0000-0000-000002A43AED X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090516-0013-0000-0000-000020D85E06 Message-Id: <1536163184-26356-27-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-05_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=972 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809050164 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The conversion is done using sed -i 's@__free_pages_bootmem@memblock_free_pages@' \ $(git grep -l __free_pages_bootmem) Signed-off-by: Mike Rapoport Acked-by: Michal Hocko --- mm/internal.h | 2 +- mm/memblock.c | 2 +- mm/nobootmem.c | 2 +- mm/page_alloc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 87256ae..291eb2b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -161,7 +161,7 @@ static inline struct page *pageblock_pfn_to_page(unsigned long start_pfn, } extern int __isolate_free_page(struct page *page, unsigned int order); -extern void __free_pages_bootmem(struct page *page, unsigned long pfn, +extern void memblock_free_pages(struct page *page, unsigned long pfn, unsigned int order); extern void prep_compound_page(struct page *page, unsigned int order); extern void post_alloc_hook(struct page *page, unsigned int order, diff --git a/mm/memblock.c b/mm/memblock.c index 63df68b..55d7d50 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1639,7 +1639,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size) end = PFN_DOWN(base + size); for (; cursor < end; cursor++) { - __free_pages_bootmem(pfn_to_page(cursor), cursor, 0); + memblock_free_pages(pfn_to_page(cursor), cursor, 0); totalram_pages++; } } diff --git a/mm/nobootmem.c b/mm/nobootmem.c index bb64b09..9608bc5 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -43,7 +43,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) while (start + (1UL << order) > end) order--; - __free_pages_bootmem(pfn_to_page(start), start, order); + memblock_free_pages(pfn_to_page(start), start, order); start += (1UL << order); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 33c9e27..e143fae 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1333,7 +1333,7 @@ meminit_pfn_in_nid(unsigned long pfn, int node, #endif -void __init __free_pages_bootmem(struct page *page, unsigned long pfn, +void __init memblock_free_pages(struct page *page, unsigned long pfn, unsigned int order) { if (early_page_uninitialised(pfn))