From patchwork Wed Sep 5 15:59:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10589153 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 99114112B for ; Wed, 5 Sep 2018 16:01:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 066342A74A for ; Wed, 5 Sep 2018 16:01:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02D472A6EE; Wed, 5 Sep 2018 16:01:18 +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 750AE2A816 for ; Wed, 5 Sep 2018 16:01:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D20D46B7426; Wed, 5 Sep 2018 12:01:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C7DDF6B7428; Wed, 5 Sep 2018 12:01:03 -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 AF9206B7427; Wed, 5 Sep 2018 12:01:03 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id 7B7BE6B7425 for ; Wed, 5 Sep 2018 12:01:03 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id j17-v6so8989859oii.8 for ; Wed, 05 Sep 2018 09:01:03 -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=HQ1ltsIXmQ9eZ5IjJ16VH1QeBxiIKp2He4LKnO/uLqI=; b=pMuZ51ZmprRvuscLqaXyp7VUjtmTfGHQaPoWWtZJ5qZj3kNlRqizi8rowYEzpgKlvr YFooEzifvxbCRmSSoauP7T5jXvyJTG+GSdBWUuvBocvOI02uxGQajEJ/DvFLdAPV8X4i 1j9O5kzfeCQPJSaXNyArNAMejZ5iGVMIu1fCFFQkpPUV6dEUNdFI7kJXjPMU9OrVUrWL WaThoWVgLD088FJjJFhDlWCML1ZJ/MIFjr5UbH8WAvXRtWQP1wPNsWZX0QXbeakwWQ33 QX+IU7BtBX0J6OBegWV47Aw4qH0pCz+zNu0yYmWuteNALIxWWa14AKr4GPCKwcUEnwzH hHmw== 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: APzg51Ap8WNzLzf1kQzwgoWAR+hUQBlHVEtRxf8jfRLEa4Uc6/f0R6hH q1J3CoS5bReXt61JQ8oxuRpdUF2vqNSgSMagU22exPAoXazY8IkKrL+muS4sViDx91udauW9mLx dc/TZ4gxEsR+WBVojhNcmRcT8PZIC/30NN+Iy3/wbl6lYavuOz18Q0JV1x0n6Dug= X-Received: by 2002:aca:5714:: with SMTP id l20-v6mr32876073oib.100.1536163263277; Wed, 05 Sep 2018 09:01:03 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZlWpX+B0DwxwPvQNPGCNoQQZLCsKpXDOzgSIMeICBFR6E5WZX2PXJhWPoYqGBNvLDd32bl X-Received: by 2002:aca:5714:: with SMTP id l20-v6mr32876003oib.100.1536163262364; Wed, 05 Sep 2018 09:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536163262; cv=none; d=google.com; s=arc-20160816; b=U4Ie5xtuyzRMv1Zc88HxPZh2QOThsBolPxOOTMzO5rN21bi3URm6xLNDTXebaognz6 /6XozI9ipn2WK1G5Bpjb5ZZ9niDObVL9Fk3H9Mj2cuHlw7WQa6iGKJSteYb3d1+O0kKy 5BsHG9M7+jGNrqShdOEhbPJwpgW5DkNNoydYxFW16Qliy1om4G5weMSel9cnAuHoNXju njz3ACNcWHaMqQx6zOpNd+rIFH3aE7uW9esQYMOKCYOzZQu+0aO+yhwf2PK6iOwP6Yne 1lH1E9mkIZ56g5r4tNepCUG4cu/Cc834FiraDG3O9FvmmO3qgn4Enk20rVLl1bxZ7wej NcLA== 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=HQ1ltsIXmQ9eZ5IjJ16VH1QeBxiIKp2He4LKnO/uLqI=; b=cSAmKF3iPsPizDl7WxrgfwQcx3IvlQTDvZ2hhIogVO0/9E9lcSMfCKx8seUL9y5lFx Ntd5eNcSXrT7XsNPMu3ZDY4dMkIIzfzD6sZEb0YQUrK/ARHPKli4D3vM6YmFg4YUMahp QMIS6vHmiJ3y+WvBkZ7CfBnaKlXpuDPTldkha2oEErp6JG4bsZmXPAw7hqi0M4x/q1XN VxB/hSg3Fw+jcsY3p2qb/uoM5J7UPYKY66QVoG2njdfwrLpP7vgjujpv4W3iHSLW8qbv 9v5lGauGGqwVWuswHpC91eWTcdpum9D5jtpdgV2O3esHDc/Brr9seiRleLdyYk1GWq5N yE+g== 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 s126-v6si1521391oie.201.2018.09.05.09.01.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 09:01:02 -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 w85FuAVa033722 for ; Wed, 5 Sep 2018 12:01:01 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mafkfgm89-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 05 Sep 2018 12:00:57 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Sep 2018 17:00:29 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) 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) Wed, 5 Sep 2018 17:00:24 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w85G0Nw441484310 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 5 Sep 2018 16:00:24 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A25FA406E; Wed, 5 Sep 2018 19:00:16 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4B656A406B; Wed, 5 Sep 2018 19:00:14 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.92]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 5 Sep 2018 19:00:14 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 05 Sep 2018 19:00:21 +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 13/29] memblock: replace __alloc_bootmem_nopanic with memblock_alloc_from_nopanic Date: Wed, 5 Sep 2018 18:59:28 +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-0020-0000-0000-000002C1B2EF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090516-0021-0000-0000-0000210EE25E Message-Id: <1536163184-26356-14-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=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=697 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/arc/kernel/unwind.c | 4 ++-- arch/x86/kernel/setup_percpu.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 183391d..2a01dd1 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -181,8 +181,8 @@ static void init_unwind_hdr(struct unwind_table *table, */ static void *__init unw_hdr_alloc_early(unsigned long sz) { - return __alloc_bootmem_nopanic(sz, sizeof(unsigned int), - MAX_DMA_ADDRESS); + return memblock_alloc_from_nopanic(sz, sizeof(unsigned int), + MAX_DMA_ADDRESS); } static void *unw_hdr_alloc(unsigned long sz) diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 67d48e26..041663a 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -106,7 +106,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, void *ptr; if (!node_online(node) || !NODE_DATA(node)) { - ptr = __alloc_bootmem_nopanic(size, align, goal); + ptr = memblock_alloc_from_nopanic(size, align, goal); pr_info("cpu %d has no node %d or node-local memory\n", cpu, node); pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n", @@ -121,7 +121,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, } return ptr; #else - return __alloc_bootmem_nopanic(size, align, goal); + return memblock_alloc_from_nopanic(size, align, goal); #endif }