From patchwork Wed Sep 5 15:59:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10589137 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 DFFA7112B for ; Wed, 5 Sep 2018 16:00:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D43B92A729 for ; Wed, 5 Sep 2018 16:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D05B02A5E8; Wed, 5 Sep 2018 16:00: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 3A3DA2A731 for ; Wed, 5 Sep 2018 16:00:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 024D56B740F; Wed, 5 Sep 2018 12:00:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ECAFC6B7411; Wed, 5 Sep 2018 12:00:42 -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 CCD166B7412; Wed, 5 Sep 2018 12:00:42 -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 9BFDE6B740F for ; Wed, 5 Sep 2018 12:00:42 -0400 (EDT) Received: by mail-oi0-f71.google.com with SMTP id p14-v6so9214448oip.0 for ; Wed, 05 Sep 2018 09:00:42 -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=MyZQls6hjnyqi6wO+v9QzKEYPYLBoVwjLZOElPOnukQ=; b=W6dEkZPY3+8OF1dn+1gTJYoBbRe+b45LYKDd5eajoVD1sWMlCa9sout1aZwZRscw+7 Jt2thZLzU2bbql0XvpEbe6or/m1K1VN+eZhFJNIIZCYR8vHi5BbaYBf/lOedGrVlPbjT 5pAKeC9AO1V52wEOqrMgD4j//imF09a30qITZMI4Yf7s9ptZezCECDp59MyNHYnSbJHG 2ENHjNL27rGBr7Z6isdIHNFF6nWZXmTocUJKnO/7NHjQtolR/MFXEI9VULNEzgz5/V6U HkZk36SxXB7OUc+kTCc/teQzSvdHhfrl1E0N2nPi7GkfbUBn9PQuoZxmgZhrWtpWhSrk j1Cg== 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: APzg51A+/pzinsaZpB4iHaBPZslenrE8VGjeqXx2A7t8jpX3g0/Z+Zuv QD+hKUA8+G+PQ+/sT5Yr3tvKeoDsnj6uFBd+CG0CrJoXfTWC/z6jBq5ZzQUg7aCv+QFz89XMR5j K/2km94IeToo8UtHow4zitLZyXvgcYywk987yM2XOZ/cmoBqaQKYCTQzvlO2lj6k= X-Received: by 2002:aca:db09:: with SMTP id s9-v6mr29498763oig.339.1536163242436; Wed, 05 Sep 2018 09:00:42 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZwwCKguWi6r8+xdxlwordaJEW2T0C0d47yibQ2Ii140rTAWt2L8NTYrV97n1Cofb226ieq X-Received: by 2002:aca:db09:: with SMTP id s9-v6mr29498714oig.339.1536163241819; Wed, 05 Sep 2018 09:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536163241; cv=none; d=google.com; s=arc-20160816; b=iVwuuxpqkdGb3TM1q7iFmr2kn1ZirB0j5sQf/cLpB/pcueGtufuKNuDBI9zg8OVwHa PwWx1SlvMnFKjyK96WJBgP1MMoJ5Yo0mfK3CtXpAi0C44nH1KzE2NJVqnswEMqPKiAeG 3LSiBD/wbGet2fJeeYBduKfS/GGyciPjad5/OQb0gjSrbOiiSO+RGI2kBawTs+5nL/wr QAMmSqmAPn+F/kk+1ZAwvVar5heoH3e6pQLJF8ujQsSrIvSW47A6tE/QBEbQ4ijlyk/G P3ZbvGmDPOWQhQsB6Lo/jGepbUIK1UbVx2XoyGxEyizhpDMBQ+rJWr/a7XRUpyM6cQk/ GtnA== 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=MyZQls6hjnyqi6wO+v9QzKEYPYLBoVwjLZOElPOnukQ=; b=XMmFXSfha0mGmTdo+Xs4N1jyBD4YNwO/A8DjMK0miKAw+XN7YN3LwhMuYGidfH8joN G51SV1ac87JuPIM+VrSTJc9Bu6uyTLIvpfzbodOKjuO3RuQsxanq+oNN9cYTEw5S502F NYlBQV1FlKljQlL+YGa3JyiNNsFhN6wCDpHoDwGe4ZLM/tVEpkFHl0qHLXQsQ1D49U28 TieuvveSNKcNp77VOWox4WaIsvi5IBsgWthMfvhiZ9SrMBqpYY4XF20TeXDclqPji0zp BtN53F5DeC6eJdnN4CFrDRhb+X5zpo4hbsRzEbnunZSmlt+v+bh7tG3fAV6gKIC7VEoA JF+Q== 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 x126-v6si1717553oif.359.2018.09.05.09.00.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 09:00:41 -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 (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w85FtUQ5022396 for ; Wed, 5 Sep 2018 12:00:41 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2maj548kar-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 05 Sep 2018 12:00:36 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Sep 2018 17:00:34 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp02.uk.ibm.com (192.168.101.132) 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:00:30 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w85G0TCw38862914 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 5 Sep 2018 16:00:29 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BA7D511C04C; Wed, 5 Sep 2018 19:00:21 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC10211C050; Wed, 5 Sep 2018 19:00:19 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.92]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 5 Sep 2018 19:00:19 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 05 Sep 2018 19:00:26 +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 15/29] memblock: replace alloc_bootmem_pages_node with memblock_alloc_node Date: Wed, 5 Sep 2018 18:59:30 +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-0008-0000-0000-0000026CBA34 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090516-0009-0000-0000-000021D4D859 Message-Id: <1536163184-26356-16-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 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=746 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 Signed-off-by: Mike Rapoport Acked-by: Michal Hocko --- arch/ia64/mm/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 3b85c3e..ffcc358 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -447,19 +447,19 @@ int __init create_mem_map_page_table(u64 start, u64 end, void *arg) for (address = start_page; address < end_page; address += PAGE_SIZE) { pgd = pgd_offset_k(address); if (pgd_none(*pgd)) - pgd_populate(&init_mm, pgd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)); + pgd_populate(&init_mm, pgd, memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node)); pud = pud_offset(pgd, address); if (pud_none(*pud)) - pud_populate(&init_mm, pud, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)); + pud_populate(&init_mm, pud, memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node)); pmd = pmd_offset(pud, address); if (pmd_none(*pmd)) - pmd_populate_kernel(&init_mm, pmd, alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)); + pmd_populate_kernel(&init_mm, pmd, memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node)); pte = pte_offset_kernel(pmd, address); if (pte_none(*pte)) - set_pte(pte, pfn_pte(__pa(alloc_bootmem_pages_node(NODE_DATA(node), PAGE_SIZE)) >> PAGE_SHIFT, + set_pte(pte, pfn_pte(__pa(memblock_alloc_node(PAGE_SIZE, PAGE_SIZE, node))) >> PAGE_SHIFT, PAGE_KERNEL)); } return 0;