From patchwork Fri Sep 14 12:10: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: 10600695 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 BE407112B for ; Fri, 14 Sep 2018 12:13:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9993E2B2F9 for ; Fri, 14 Sep 2018 12:13:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C5E42B38F; Fri, 14 Sep 2018 12:13:51 +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 0E8A32B2F9 for ; Fri, 14 Sep 2018 12:13:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 257988E001C; Fri, 14 Sep 2018 08:13:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 206C58E0001; Fri, 14 Sep 2018 08:13:49 -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 0CF758E001C; Fri, 14 Sep 2018 08:13:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by kanga.kvack.org (Postfix) with ESMTP id CECD88E0001 for ; Fri, 14 Sep 2018 08:13:48 -0400 (EDT) Received: by mail-oi0-f69.google.com with SMTP id 20-v6so9262775ois.21 for ; Fri, 14 Sep 2018 05:13:48 -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=oO8cCbG3FI3lzVwQn201V4TFuz165o5qm3FoHqB+p/k=; b=YGEnlli5s1ZZOhMY6DU7g+HK8Snvq7oPSBlOk0S9Ryvbl0jq1wDate4rxzxO6DTXrA EqnZR81F+hojAnukxH+9O19IhYvO/XqG6jynBEgdS31KvwJ7qGLKlKQ3jgfGTSqTmPSa STdW7l68a94dtdKP5eGQ3ungo/xGH9qq9QZQVotMMysqWVPCu5RX/qtZWVyM2lQVmGgy eks4VSXwnTnWYlsFSetEP39ekBCROcK+rCu6r1IsB39dMM6RPoht3Vfa8kE0cAwvnK1I OUsc1mG7AQhuG7xzP0YpEQ+mqstvN8enTB5zOJzIQPiwHARNquu5t+75bfxTCYB4FNUq LyLQ== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 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: APzg51AhxTJkBA6a3yIYOS4nV1t4W3Gx+912OpNGAyeCpa9mlus+hWA9 Ey5UyXYiBIWKm4ZVAhmMfWv0onXUjpyT3UnQEFTJILhwMMwVxxKA3kO2r67FgA1equ7m3df86wf uqWvP8sMp/0ggJV6yMhSW3pjgp3On8ATiM01LM16kX2zzw+I39UJDmqLsk0WQ3cQ= X-Received: by 2002:aca:40d6:: with SMTP id n205-v6mr9735803oia.35.1536927228630; Fri, 14 Sep 2018 05:13:48 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbn7F8qg/Kpq/JCtM73r1r7t7nO7ULMpLi6BEe5fCI7jXzbEO00kT+hJElZgAMpkPzx4yNh X-Received: by 2002:aca:40d6:: with SMTP id n205-v6mr9735768oia.35.1536927227801; Fri, 14 Sep 2018 05:13:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536927227; cv=none; d=google.com; s=arc-20160816; b=daXw8Zmzustw/LxVf9HFDvqk3ezADE6yKImwSb+Hn0+LTSBDEmlpJp5fzVR15CErHC J/QVWQTfKHy0KYcb6QL7GshCYe25PdNtC4IldgV/UR48PXmMpYjicM8HJ6ebuhH/dG7r Q+kMjh1ObVIXqg5Cbeq9NjcWOGptcD1odiTnQ2yzMGB5e52Nlv3TH9nzPB4N0QWQpKD/ zvEDbJgCr34HrC2Z7W6+syvCPeiM42Z+kk57LTFaWbzVhVj8k2kmneqDck67gL9K+ICP O1qQYd6GmlhJjF2bDBGRV87MQar28+Q5wam7fho9/E8r6X9NftBhH4wimib3tyOeQrFi IABw== 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=oO8cCbG3FI3lzVwQn201V4TFuz165o5qm3FoHqB+p/k=; b=TlGdb5eyIX4CuLwmwMTcrRFYU0qK2Krhz6fGa3eVT34J6AjgiewZ7BVyLP4Zl8Qkzp b5Y8D7GIbdLas5P4wLLBnxdFUBSnQ4cndQR8Uo6CvHXulOiEobmaEdsYhliKkqk3OXW8 pGQlXk9ceak956KibQnQ8ac0nGVybsDzDN8RL7gO8HES8Fulct21OLsfGONxd5S9oIV9 lkx3gykvKXWk9v+Mgr31RYYIIBCX0HU413gwTO+eA43bboDhhunc7VG+Vu9aJqCnL07G 23MBmmSskTRkVZ+rI514xlLKmbMX80KHQJlLjc76OpkI73D9ynrHkHMP2T05iLIQHkNC IGWA== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.158.5 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 (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id t29-v6si3813096oij.173.2018.09.14.05.13.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 05:13:47 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 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 (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8EC59t4010029 for ; Fri, 14 Sep 2018 08:13:47 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0b-001b2d01.pphosted.com with ESMTP id 2mgamuw8qs-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Sep 2018 08:13:45 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Sep 2018 13:13:42 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 14 Sep 2018 13:13:31 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w8ECDUSB786938 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 14 Sep 2018 12:13:30 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FD1DA4055; Fri, 14 Sep 2018 15:13:18 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F0609A404D; Fri, 14 Sep 2018 15:13:12 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.207.116]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Fri, 14 Sep 2018 15:13:12 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Fri, 14 Sep 2018 15:13:24 +0300 From: Mike Rapoport To: linux-mm@kvack.org Cc: Andrew Morton , Catalin Marinas , Chris Zankel , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Greg Kroah-Hartman , Guan Xuetao , Ingo Molnar , "James E.J. Bottomley" , Jonas Bonn , Jonathan Corbet , Ley Foon Tan , Mark Salter , Martin Schwidefsky , Matt Turner , Michael Ellerman , Michal Hocko , Michal Simek , Palmer Dabbelt , Paul Burton , Richard Kuo , Richard Weinberger , Rich Felker , Russell King , Serge Semin , Thomas Gleixner , Tony Luck , Vineet Gupta , Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, Mike Rapoport Subject: [PATCH 26/30] memblock: rename __free_pages_bootmem to memblock_free_pages Date: Fri, 14 Sep 2018 15:10:41 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536927045-23536-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1536927045-23536-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18091412-0020-0000-0000-000002C64C19 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18091412-0021-0000-0000-00002113AE0E Message-Id: <1536927045-23536-27-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-14_06:,, 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=922 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809140129 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 1534edb..a2cd61d 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1615,7 +1615,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 13e394c..f4a8bc8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1334,7 +1334,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))