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 571F6C433EF for ; Sat, 25 Jun 2022 06:21:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2B028E0291; Sat, 25 Jun 2022 02:21:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DB4C8E028E; Sat, 25 Jun 2022 02:21:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C9B88E0291; Sat, 25 Jun 2022 02:21:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7DB768E028E for ; Sat, 25 Jun 2022 02:21:00 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4EB44207E6 for ; Sat, 25 Jun 2022 06:21:00 +0000 (UTC) X-FDA: 79615760280.21.4B1F7A7 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf07.hostedemail.com (Postfix) with ESMTP id 4D0B44002E for ; Sat, 25 Jun 2022 06:20:59 +0000 (UTC) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LVP2j2DR7zkWXD; Sat, 25 Jun 2022 14:19:09 +0800 (CST) Received: from ubuntu1604.huawei.com (10.67.174.160) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 25 Jun 2022 14:20:54 +0800 From: Xiang Yang To: , , , , , CC: , , , Subject: [PATCH -next] mm/memcontrol.c: replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled() Date: Sat, 25 Jun 2022 14:18:44 +0800 Message-ID: <20220625061844.226764-1-xiangyang3@huawei.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.67.174.160] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of xiangyang3@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=xiangyang3@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656138059; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=qie+qTlqR/84+XVTK+A9uTFbTLHHtdKaXQBbtWlw6SM=; b=vf3bjp8iQUKgoGeq2617GQAnBEiAlmwy3bCLNzTskkf0Zte30EsC7bVDdgDGxeoFwnIME5 83s+yn2ebaoZpejuCBTAZgzY9xbHwD4IUoylAXFvd9IpkNIhXy7TQldmu9LGkmA8xYoZxy xsyKWG7lMKhmp3FXPCvTZD37w58C1fo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656138059; a=rsa-sha256; cv=none; b=y7nxzpuIXpfMQkThre5KJEtxiIPUq3RUcoJuMPnbPT5CQurSRAr164gU9jKe1Tpydj7sUI BE7O/UP3bRMHrYuAWK79IOcXC0rryiF1RDdY5n5q3a/DlaFMD5WQ8C5Q+y/EcGmBYhvU5y Xt0luraXkgjzzJMeLSPEdDSsZA0jqg4= X-Stat-Signature: n6to8ypx33i9jwa5fnppyg7zyzkda7ww X-Rspamd-Queue-Id: 4D0B44002E X-Rspam-User: Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of xiangyang3@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=xiangyang3@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Rspamd-Server: rspam02 X-HE-Tag: 1656138059-84655 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: mem_cgroup_kmem_disabled() checks whether the kmem accounting is off. Therefore, replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled(), which is the same work in percpu.c and slab_common.c. Signed-off-by: Xiang Yang --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 85adc43c5a25..4672c9ddd188 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3815,7 +3815,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, #ifdef CONFIG_MEMCG_KMEM static int memcg_online_kmem(struct mem_cgroup *memcg) { - if (cgroup_memory_nokmem) + if (mem_cgroup_kmem_disabled()) return 0; if (unlikely(mem_cgroup_is_root(memcg))) @@ -3830,7 +3830,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) static void memcg_offline_kmem(struct mem_cgroup *memcg) { - if (cgroup_memory_nokmem) + if (mem_cgroup_kmem_disabled()) return; if (unlikely(mem_cgroup_is_root(memcg))) -- 2.22.0