Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp3991725imm; Wed, 5 Sep 2018 09:02:20 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ6v0wkabRi4pZOzgMvANzKqtCsndMACqydiXYz5GB5hRG1p8XNPh86TYDWoRrxKg5i0hIE X-Received: by 2002:a63:fb07:: with SMTP id o7-v6mr37074511pgh.333.1536163340285; Wed, 05 Sep 2018 09:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536163340; cv=none; d=google.com; s=arc-20160816; b=pzn7bq4mG/+/J4Ge64JGZzwHwVD4nUNAzrXCJHEFYuFnglQBeRinVBB0pjt8rGmpsQ 78NsB3rSOvUw6SVVBPJZmhAB3RfyvKzj/HJrOJCVTkD65u3mhzWLWS7M0L1941pDy9gt 5pITczG5NlwcPn+6Y3ZYCiMsFHtFn+pv/L3Hki8Lx/571Swq0fHkiU1yutmrE9kOImJF eja1Lcw5oAwkSAqWOMZ/pg9PxtrLf/YnNUBIlB3jBfBFcPkZDZjjifVZTT7RYTzY5tQr D+Wlk2YQOghNoVEjeHv7cJPWT4iipQnWFIWSuACVcHVKcGonnyxl74Y1kyb2dyOW3cs8 EwkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=E3fjE0+oQcVWwsiB9Pm4R6kXDL5AyZqKew/L/3djGBg=; b=K59NaD75wBm7FJdGCdVt9UTyn3uylgQujBYbpT0P5EKMsF7dVYXrzrptGDOpBTAPp4 6fXc3pGuOkThCtNpSuwIzFsGD6kGzv3wQVEirFRjoOg41My8EBMMBWBzeMeB+HtA5ASj BbqwVR1yW03YGu+lb7KjyvPQ6tD4eLvzDxzjQsRwtKpwqT8gPQEf6f3VQ55rWRbmXFYp 01+c3EpgMS5wAWoz5YFhPazgCmDtG80az3PaA3ZhkUHN4gawQ++Yuzo1YwksvoNj4Ll3 klJDjmsLZOxwXa75/ip0sVb+FDAR1zXb6BTRns49J6jrOwHGpWu+eT4Gi5JbwPQj0FdW KMgA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x3-v6si2236977pgr.27.2018.09.05.09.02.04; Wed, 05 Sep 2018 09:02:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbeIEUbV (ORCPT + 99 others); Wed, 5 Sep 2018 16:31:21 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:19505 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727883AbeIEUbU (ORCPT ); Wed, 5 Sep 2018 16:31:20 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w85FvYXO081241 for ; Wed, 5 Sep 2018 12:00:30 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mah4g3qyg-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 05 Sep 2018 12:00:28 -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:21 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) 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:16 +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 w85G0FHm38666490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 5 Sep 2018 16:00:15 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0EAEB11C05B; Wed, 5 Sep 2018 19:00:08 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E9C9E11C070; Wed, 5 Sep 2018 19:00:05 +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:05 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 05 Sep 2018 19:00:12 +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 10/29] memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic Date: Wed, 5 Sep 2018 18:59:25 +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-000002C1B2EA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18090516-0021-0000-0000-0000210EE259 Message-Id: <1536163184-26356-11-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=746 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809050164 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The __alloc_bootmem_node_nopanic() is used only once, there is no reason to add a wrapper for memblock_alloc_try_nid_nopanic for it. Signed-off-by: Mike Rapoport --- arch/x86/kernel/setup_percpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ea554f8..67d48e26 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -112,8 +112,10 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n", cpu, size, __pa(ptr)); } else { - ptr = __alloc_bootmem_node_nopanic(NODE_DATA(node), - size, align, goal); + ptr = memblock_alloc_try_nid_nopanic(size, align, goal, + BOOTMEM_ALLOC_ACCESSIBLE, + node); + pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n", cpu, size, node, __pa(ptr)); } -- 2.7.4