From patchwork Sat Jun 10 03:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 105893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1365636vqr; Fri, 9 Jun 2023 22:43:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ICPnDOkbyipzSsSGUt306Z8K/NGAm0+9FjezZsq1SJ32aZJI3LzqWw11AYFiGziiYilCK X-Received: by 2002:a17:902:ee51:b0:1ad:d500:19d3 with SMTP id 17-20020a170902ee5100b001add50019d3mr1042815plo.23.1686375816135; Fri, 09 Jun 2023 22:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686375816; cv=none; d=google.com; s=arc-20160816; b=mJRdshKzeulX2zpGeVHHp/+j87YbIvc5B4yOzVhFuJHIYDOF1an9gvSia+zmfyH5NH A4opn8y6I00smH4qUdMqQ9lnk5xoo9VdmMlGOP9suF9XsWqefT8fpK/p3UicuAKIvhM2 3T3uqGRKccbChHJJKK5EhGfmoiKfNo+p3xy6XTMZLBZcbHyBbWMgabvc/6VIiVilHSWn OZ4LJA6W8d+4eITcvPuYEoZoRJfyPUpVnrRoy6ghIcR+2KNVw2V5Kdii4JAlJDqiRCIr zSgd/nKa9HVLTbAx/eo5UYOrkDftz8+v9FhDS5YDocEBG5HSSPcAZmDlaa1waNw46lQR GfHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=FzX20v5pR8D/Lshu3JMLlGNfxUIHwwTccEDnSAMNj9w=; b=oSkqbWb33gWWxbB15gsFj1M62x6S3xIMBT93//aUCXDFmL2PpJLQDtra0etPpiMd5J k8UfL/ptH70bGtn6nMQ5INtK3rOsk9+V0xInrCRHtA3b6aFwLvIL85pqo7rKPRFtl8Wh FNqPpFm89om0xgTNNml2rkoRrVntWZ8qpoIwcs86ZYDCKwX/FJ4ocF5pkTe5hWb8KlHW LubuJ1dHO3DW5oGJhRSHVNUfee9K9bCo5TRxtknVz1/3h41DPtgwRhgU60GfMCp9b7oj Er2OZRoeTCM3XH2XcxmrOXmL1doAJsDgpkBh5j12cV4NY/lImBV1HG61Wog5YKSe8GMf TkLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f4-20020a170902ce8400b001a643dfb884si3869637plg.451.2023.06.09.22.43.14; Fri, 09 Jun 2023 22:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230226AbjFJDqj (ORCPT + 99 others); Fri, 9 Jun 2023 23:46:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjFJDqi (ORCPT ); Fri, 9 Jun 2023 23:46:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854921BF0 for ; Fri, 9 Jun 2023 20:46:36 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QdP1X3jC8zLq5N; Sat, 10 Jun 2023 11:43:28 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 10 Jun 2023 11:46:31 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm: compaction: mark kcompactd_run() and kcompactd_stop() __meminit Date: Sat, 10 Jun 2023 11:46:15 +0800 Message-ID: <20230610034615.997813-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768293207631542483?= X-GMAIL-MSGID: =?utf-8?q?1768293207631542483?= Add __meminit to kcompactd_run() and kcompactd_stop() to ensure they're default to __init when memory hotplug is not enabled. Signed-off-by: Miaohe Lin Reviewed-by: Baolin Wang --- include/linux/compaction.h | 4 ++-- mm/compaction.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 57b16e69c19a..e94776496049 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -98,8 +98,8 @@ extern void compaction_defer_reset(struct zone *zone, int order, bool compaction_zonelist_suitable(struct alloc_context *ac, int order, int alloc_flags); -extern void kcompactd_run(int nid); -extern void kcompactd_stop(int nid); +extern void __meminit kcompactd_run(int nid); +extern void __meminit kcompactd_stop(int nid); extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx); #else diff --git a/mm/compaction.c b/mm/compaction.c index 3398ef3a55fe..8859cc91062f 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -3086,7 +3086,7 @@ static int kcompactd(void *p) * This kcompactd start function will be called by init and node-hot-add. * On node-hot-add, kcompactd will moved to proper cpus if cpus are hot-added. */ -void kcompactd_run(int nid) +void __meminit kcompactd_run(int nid) { pg_data_t *pgdat = NODE_DATA(nid); @@ -3104,7 +3104,7 @@ void kcompactd_run(int nid) * Called by memory hotplug when all memory in a node is offlined. Caller must * be holding mem_hotplug_begin/done(). */ -void kcompactd_stop(int nid) +void __meminit kcompactd_stop(int nid) { struct task_struct *kcompactd = NODE_DATA(nid)->kcompactd;