From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 766A2C54FB3 for ; Mon, 26 May 2025 14:51:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 080D16B008C; Mon, 26 May 2025 10:51:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 031926B0092; Mon, 26 May 2025 10:51:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E62F86B0093; Mon, 26 May 2025 10:51:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C3DB16B008C for ; Mon, 26 May 2025 10:51:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 73293E76FA for ; Mon, 26 May 2025 14:51:08 +0000 (UTC) X-FDA: 83485346616.21.6B5EDD8 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf24.hostedemail.com (Postfix) with ESMTP id 22C71180006 for ; Mon, 26 May 2025 14:51:05 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=X20GFcMW; spf=pass (imf24.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748271066; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=z1zMbJWS4TH8bmZrIMKw//pZQFS0ilbqi+ycdqO3B7M=; b=HDVnY+JLOu8fdVmS4ENZTQuaFVcuSQhnvEDgeZtGrSdEa9qlJ3Zc31r9c+tNpagoXLCOW4 a8dO1NHYhtxBM47m8ZjqnV0x3JIayo/908IVcdEf9PxGa16yKMSSO/q50ECvfPfU8OrGgP LSXZ+uM6IZ4EuG+/jx51tE1pacNZQUQ= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=X20GFcMW; spf=pass (imf24.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748271066; a=rsa-sha256; cv=none; b=RqMnExeDic9twKHw02adjLsdFPllDBrVNuMxXLD6wxAxWNkQRrETeXjATzQFeNpA/D7BJT DAZcLtY1+hno1xwvD36uho01b2z+oplTRsyCaXFCPlUIwx7Sja7pjnWPxwYzsdkuKhEaXt UpDMypm2c7ZNHjSMUnSFrX2dRg3dOpI= Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54QCYdqF000346; Mon, 26 May 2025 14:50:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=z1zMbJWS4TH8bmZrI MKw//pZQFS0ilbqi+ycdqO3B7M=; b=X20GFcMWUfO5WVDMLqxtQ8/nKt0/f6HZV 5bGWpDEsuLeZV8keKeE/FgjGGJOJ3P/HZLqB/gQmg9bHBUQEuSfqBo1UMJ4hLgPL d9ULqO35QZ5f0qUU7a6wBbAiCqyY58YLbNvSOSDlxXSc1Vao8McVuzt0LcvQFYxT r0CBkpK7mRxotNU+xJky7rVoEVk1yhAHTAjTAftcBtzZ5vC1FcPQXCztAp/FZAeO DYLgBGJsK7lrb5lI+0K9ORP7qQYcrJWclQW9MkT3j+fea22okW+xJlj0EvP93PLe uJGQ6udcPcmPNMtOSYKeCnamxfGMQksQmPqPG9GKA15gyNUCbQSUQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46u4hn9tkj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:53 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 54QEcxhw026243; Mon, 26 May 2025 14:50:53 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46u4hn9tkh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:53 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54QCLp05010712; Mon, 26 May 2025 14:50:52 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46uru0epfb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:52 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54QEom8u52167014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 May 2025 14:50:48 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6455D20040; Mon, 26 May 2025 14:50:48 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC5852004B; Mon, 26 May 2025 14:50:45 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 26 May 2025 14:50:45 +0000 (GMT) From: Donet Tom To: David Hildenbrand , Andrew Morton , Mike Rapoport , Oscar Salvador , Zi Yan , Greg Kroah-Hartman Cc: Ritesh Harjani , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Rafael J . Wysocki" , Danilo Krummrich , Jonathan Cameron , Alison Schofield , Yury Norov , Dave Jiang , Madhavan Srinivasan , Nilay Shroff , linuxppc-dev@lists.ozlabs.org, Donet Tom Subject: [PATCH v6 5/5] drivers/base/node: Rename __register_one_node() to register_one_node() Date: Mon, 26 May 2025 09:50:13 -0500 Message-ID: <6a2bd4deee8a9274e0d3dafe965c0119b2191b7d.1748270306.git.donettom@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=HvB2G1TS c=1 sm=1 tr=0 ts=68347fcd cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=TOWdrs_80VijkQ5-_Q4A:9 X-Proofpoint-GUID: L9YG9Z0U6pdcl2KylbHoKxa4EPuOaSgG X-Proofpoint-ORIG-GUID: hwYt7O5gek2eQZPs6b3DFrFhwS7BUQ0o X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTI2MDEyNCBTYWx0ZWRfXxidBpmOfzPKB JOgse1ajFprNFvlOqFy8a4TtOPrIrzHJtwAhJaHzjbinRjcGhMkNzR4Lyka/OYbKY081hSuBUjR Qx08s3UAZ/KqWhMztya+/7By3e87Atb8Xlz3pTChB74Z+2XP4ixQotRmxOJnXzasbodG2XK6dRL XAGkXQVzNoyCLCBthNKINwQe7MfDGGspj/Jwn8QalMFE6CsdTjF9YqGgH44WhYaCZlndkTw+vra XjGgoHk9T5s7rZaMZla0FRmIFdLLFCh6tFCO9zOurmdL1d1s5uTIuwnTItDm9brp/QJ7N5e0jl6 u7m9/HEVsyY/PAxkUT+jnlKoQEKr7zbjq/rBaROGjX8FO36qM+v9HSe7LOsM+GhEr/udRdM+44k Hr22xoZtDBL+KZ4demehdOViu+WrBDXMLAo1OFkBf05SmO8iWJpowwyY3eQr52KE2r+ZZ1Fl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-26_07,2025-05-26_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 malwarescore=0 mlxlogscore=964 impostorscore=0 spamscore=0 mlxscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505260124 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 22C71180006 X-Stat-Signature: xnbiwm11rxguxwsiwbwrwi5657tkgj83 X-Rspam-User: X-HE-Tag: 1748271065-311656 X-HE-Meta: U2FsdGVkX18jIyjU6cLBTP+QKC/i7a3XpkiXDoOvI7QK2+4DbpaRiXH+0zeBi4iZ9GZSrtwg3KIgIbo5Gux/tZkLfLUC3bECsW2B3GkoS2UE4eT1gMMNxtgHgqqdKhyFdSF1Z6p7WO3nIy6oATizqS1HwRjgGIHZL9GASojDyKG+Pvo5vo03fSUDGJVjntJJoq2WBxuOeIUkKFO3QJTMSNmlBKBrZ+16+OIrC2b0MrvmIILFqK9EY/Su/oLr3yEev5iw8bctPAVv6O/X1IaAT9Ya0nKdXHc3qF7QGPJNfo1k9BgG5wujYqdAdrOwEnqljBBQYs7ELhIT/7g5LZUfG8oFQRd1vowNcodlZWdd+6ZZaOPae7KqxiGZB9WtSO8MfCvCJ98K+wxTOgsJT8mic85sE822KYKu0PxkuAI28+7WKfcw++IZf5tSNZf9CGqUZcqJCvwMu1ZqGLs89hAN98j7A+yCLPvzmaopoJ5V/PLTNx6qdF1qH8NcLjMK8TcQocf8JSk9gMUUUZJOza3o8uEJjkpj1WGGeTpimNzOo7V3NNzFzNotlzygj7+la9URLyPRS1H4tQ0TS/ah8SA5JXDTnpDuYkFppua0I8BJR/FfDOWPrzma2GdBqbMfQXV7DRJDL6FixE8ZQJgwd64RBtj6PqpCXKRpQ872cGHPIpdtGhUcKEWbTqHtOIiFBY/VSRai+STOTaMR68BhYxNPre1tvlr3pDdnmnPEBb3U3MHVfuEE5lKGs0yL4qmWCp8WR/37U4KPg4/m4CJ08i17TbyGy8adQ2y5ldSfEcEz8nvongRMCgmZUNN/0nRuFieV+9VKEFupvfA/1nYRgbPA2wjQsd/sac57RZMqdsSfzYl2djK630v7WhfAAkB5LDD4gj2BcOHyBSF/rYNPgfMG9yltRAbkMyKBru3y4lwReX9NSTpbvo0jryLqtM7MUM/M9oC8jIZz0uP/4HWmmXO CNO256D0 SqeS59J2a4UD9w3CvISby0TB3zOrfaVv3Go2W+zFG53FV54Hbl/4DYnHqWIGKvCeYeG6xgemigxR0ZIZOBp5Be07xSsuGncA63O9bh8YcME5m8CDJl1XKtjox0fiUcUA3NmNFQ+Xd46sHtc0Qh9K0xINfmb4LrUuiFwocZSpw+lKZOPKN9ylo5Nx+VOwO0O5q4sr1vrglXmakfWNeCC7AF37NE1HcRKQb65hI/JdVtNWD+24jeJmjZiFaKXjiPATGFRjw7nNqwaGG7cqk2awFlVuRzjw+rAWBVcP4liGbMvkXMTrt74qqJAgdIfFqMaj3Bapp 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: List-Subscribe: List-Unsubscribe: The register_one_node() function was a simple wrapper around __register_one_node(). To simplify the code, register_one_node() has been removed, and __register_one_node() has been renamed to register_one_node(). Signed-off-by: Donet Tom --- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- drivers/base/node.c | 4 ++-- include/linux/node.h | 13 +------------ mm/memory_hotplug.c | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index 52e2623a741d..aeb8633a3d00 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -29,7 +29,7 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn) nid = of_node_to_nid(dn); if (likely((nid) >= 0)) { if (!node_online(nid)) { - if (__register_one_node(nid)) { + if (register_one_node(nid)) { pr_err("PCI: Failed to register node %d\n", nid); } else { update_numa_distance(dn); diff --git a/drivers/base/node.c b/drivers/base/node.c index 9d0977fa50e3..94b8ac116aa4 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -852,7 +852,7 @@ void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn, } #endif /* CONFIG_MEMORY_HOTPLUG */ -int __register_one_node(int nid) +int register_one_node(int nid) { int error; int cpu; @@ -959,7 +959,7 @@ void __init node_dev_init(void) * to already created cpu devices. */ for_each_online_node(i) { - ret = __register_one_node(i); + ret = register_one_node(i); if (ret) panic("%s() failed to add node: %d\n", __func__, ret); } diff --git a/include/linux/node.h b/include/linux/node.h index 75b036a100d2..88bceebcbfa5 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -128,14 +128,7 @@ extern void unregister_node(struct node *node); #ifdef CONFIG_NUMA extern void node_dev_init(void); /* Core of the node registration - only memory hotplug should use this */ -extern int __register_one_node(int nid); - -/* Registers an online node */ -static inline int register_one_node(int nid) -{ - return __register_one_node(nid); -} - +extern int register_one_node(int nid); extern void unregister_one_node(int nid); extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); @@ -148,10 +141,6 @@ extern int register_memory_node_under_compute_node(unsigned int mem_nid, static inline void node_dev_init(void) { } -static inline int __register_one_node(int nid) -{ - return 0; -} static inline int register_one_node(int nid) { return 0; diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f734cc924b51..4dadd156f836 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1571,7 +1571,7 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) * We online node here. We can't roll back from here. */ node_set_online(nid); - ret = __register_one_node(nid); + ret = register_one_node(nid); BUG_ON(ret); } -- 2.43.5