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 4C237C7EE25 for ; Wed, 7 Jun 2023 03:24:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 980978E0001; Tue, 6 Jun 2023 23:24:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92E106B0072; Tue, 6 Jun 2023 23:24:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F5EB8E0001; Tue, 6 Jun 2023 23:24:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6E82F6B0071 for ; Tue, 6 Jun 2023 23:24:18 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3F4434067B for ; Wed, 7 Jun 2023 03:24:18 +0000 (UTC) X-FDA: 80874508596.28.57C5088 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by imf21.hostedemail.com (Postfix) with ESMTP id 6D0901C000C for ; Wed, 7 Jun 2023 03:24:16 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=j9g0z6iC; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf21.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.44 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686108256; 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:references:dkim-signature; bh=OgwZPlgTY4glqblC0q55tNx4aE1dg2OGEiZu4tHi+PA=; b=LSHzN2Is3j8YJuralxqJnLoy88gEz3z3Ii76xyzPoo5avwB+8GDRwFUGyQrN+K7rHzQ/M3 LJhAdd6kSYKqZcNxaSHV+tPUT2Zs6ok+dfirIpJ8n8O70OLIxdxM3g+kKH8e+1sgYvbyPw P/mmTFdWe1R5517aMlC4XmuwbvVR1xA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=j9g0z6iC; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf21.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.44 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686108256; a=rsa-sha256; cv=none; b=hfndfqpPaEKuDMF/ovIcK7Cdhl+PuaVHMHMsz6cm19Yy3SofLDPTXO2aL9TzsFie7DCArc /6PwNoLEYLGvA5dZSMASKawrA0BO3AKV4Pf6TBjxcKYZEItM3v+hgIVS1sS4nFGxlVNN6g VP3HUpYG/7hJkuSe5pDDOWN5ckOD6pA= Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-6b162127472so2791063a34.0 for ; Tue, 06 Jun 2023 20:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1686108255; x=1688700255; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OgwZPlgTY4glqblC0q55tNx4aE1dg2OGEiZu4tHi+PA=; b=j9g0z6iCjf5/NTI/5hhX2u4AuPVNqXlbHH3MbIGdy40fOLvhk+dKprh+tscjzve6bg KtHVmhf5oKWv94BxnbHyCk+H+VVxiOoD6pVSgdfqjv6ebPIzVvLcKWbpQYoQGigw+pw+ 25Heu3c3+wxTXeQBoQ0YawhVpa98WophCTYonpf7Xe1X7v9FEpNKWUPIvCO4HETrKUpm 51tPr+e8LjGaIKLVgGtIkHv65cUe5hZev1xjKPB01f7/gY4U7oLeScGKVCoUzdyugGNH FfWgwHmpl95zM1H8As0qwVAA6CvqLyJLGASCgRVliIYGf5x5n5Q0jejrXivqMmG5R6qz Tqfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686108255; x=1688700255; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OgwZPlgTY4glqblC0q55tNx4aE1dg2OGEiZu4tHi+PA=; b=E2A94b8c9pWHv7LMKMGoR1Way+tc4/+fmQ6IqFAsMu0q5KMZfhVtHRvp1kGM37Nsnz divds5GUsQkQm1+W/leXDReQik9XBBHu85X/Pmd1fLf8764AV6qdoyGNS7bjHhwGlPfz +Lr3p6S2Q7+v8ht2yupBONzVtJm7zk7I5qJ21xCq/J9ZLt+Z80D8MVv2AVtJPjFMKMZK 4fetgKsHq8YKVpL+N8NAnwWzStvIZDvRKiQKblYu4cAZJZExWtwOkQoIyDuZkLtxEwYB nO9xJxQCSoNqycTMnkliQXuLDM44P+Ynty0uB9aaAq0wcJuoKpb3+auybl7tleySUwXZ fbdg== X-Gm-Message-State: AC+VfDxOrmtEnava+fi+rmBHyPNvnZ52L2mFgbRYFlfmthqX+5oscrDo yeVVXdSPYE/pxeOsUgQK9rz5xA== X-Google-Smtp-Source: ACHHUZ6TlFM03zUCwMYtVp47KAlUrytE63DdFa39QIYecIs6QaU7rVWkQQqN5KhIXWUqpkvpc6EKQw== X-Received: by 2002:a9d:750a:0:b0:6af:9219:25ae with SMTP id r10-20020a9d750a000000b006af921925aemr4154937otk.11.1686108255477; Tue, 06 Jun 2023 20:24:15 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id x21-20020a62fb15000000b0064fff9f540csm7337567pfm.164.2023.06.06.20.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 20:24:14 -0700 (PDT) From: Haifeng Xu To: rppt@kernel.org Cc: mhocko@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH] mm/mm_init.c: drop 'nid' parameter from check_for_memory() Date: Wed, 7 Jun 2023 03:24:02 +0000 Message-Id: <20230607032402.4679-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6D0901C000C X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: uanck3cksmxmhcwae81j1jedtu91xs71 X-HE-Tag: 1686108256-818100 X-HE-Meta: U2FsdGVkX1+Vpk54Yj6QwCoBhE36dR/2eUBSHtnjhUYsa6Snr/8X+CSF1alsQvMVTiMn8yqZBrXRuu7H0bVf1oYc6j0ap0/DLeW3ukjBYe+asVb+m4iPaadzmFgsIOWj/jlXMlj6orfsgZq8A3mqbFSbaoRnPdxR2Bwc5o3It/gR2m9/YP81RjAB3LAieRRNaAaaeaqqKy4u20Z86tjuM4azJTKyr9IpeFBUKcQhnsvvJB+CekdeaQ52m6fvjjIkbd1D7xVSPgo94wJfoULbGK8aQ6xxb+/VdnB2QO8wGAifcyw77VPvdmN/SYGBpDQrJz4Wk8ahxVScj0gZTemHjXy0hm7rze7k4VDrlIA04Afo+4NEAmcn0voNyZ54wk8lPcKpMFtKTMgcnHbU/4ZTICHI1HKnxpEKB/ZacwPOwHLMuZO8vTnSYsJm60oK+EtylZbjXEJ7Htxrsr/WfW7MNYvG8q38hMWfAzxbqBN4r8usdW3Rnnpf2Niv5eUtwOnqyqT3s7UJ1VlkstSP4XEkN5QWsCHkffjcsjMs6HrYJXWvS+EGkgVD9vmaAJeQ77G738Q8MYnaCUCYi4SAH6iD9EsRZDF0lt79RjlrkL/oUyDkRTytBo8kJHmsAxCKV7ySSRpcnIzjV5BG2o8D738VXucZn2LAce7MrbEQmZzBoodNZPzHpQ0X+YiCTgwdMwmnK/AdSgjVyzpaj8EhcA8R5Gylcf6hrCUy7oTP+kuhyZkwCElRlZbGroGgJ34zfExx7BlXsjrgNduaWFhZrMjPlrF740omLGQRUzij46stubBcBqtMXYYhyaWGVYN9c6k27hfNiNdwgJdP7pCPuSV7kxpTZZsi2GlbgNQm3CZtcgLze7wRAenCyab3fEO4qN7iNn1WoBp6KDE30qp+1GxxSAxGzAg6xftH3THyGyY5RmhUBHNwaJwSIRVcL+QZvnoEhh8pGfkPJAHWFmd8ER6 lzcnZ4lw 9BwXSfZ1+rOmPC2sRK1ZwU04icy8df1UirVAwT0xvvIfPpShIci2fkIrL1ihwhcVfC85wgcCM+h1Rn94QRXC+E7ys9xReTpUY4lZXqXCpOkrB6YOBUoUNXwIl8nOkp04EC27oI3A//ebQ2tVSnboYP6MWKrrEJ3cp86QAPL/Ku6X9rfVxNB0JKQHc7nz4a7Wmjb3eMDPHqsp9h172ej3HspWuXFBhl4Ey+YgwHNeGqBCkPBmZCR7H6gVYfWXOuDLxpc5Yfxco0LE1wxS1PJf8/exGQnYFo/iSGNOi+QjmKSVkFfAURsEiRO4Mwk3brajOE7ANowpu1zM4JjaAn/mjk7lyHvJ+kOFVYHYmmsQCO56oLpr0lHhv1bEd4WteSa/IQA9Umvo0lqSHJSGkVeD5yufIv5jI3jZD5GAefOcmh0mtczLH44NVwFaGVzy1iAhzshXpCoEfW/inHwvegw1XOsc+fG14Cy2l2ROQ 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: The node_id in pgdat has already been set in free_area_init_node(), so use it internally instead of passing a redundant parameter. Signed-off-by: Haifeng Xu --- mm/mm_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index b82718d596c3..78e67041ae9f 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1725,7 +1725,7 @@ static void __init free_area_init_node(int nid) } /* Any regular or high memory on that node ? */ -static void check_for_memory(pg_data_t *pgdat, int nid) +static void check_for_memory(pg_data_t *pgdat) { enum zone_type zone_type; @@ -1733,9 +1733,9 @@ static void check_for_memory(pg_data_t *pgdat, int nid) struct zone *zone = &pgdat->node_zones[zone_type]; if (populated_zone(zone)) { if (IS_ENABLED(CONFIG_HIGHMEM)) - node_set_state(nid, N_HIGH_MEMORY); + node_set_state(pgdat->node_id, N_HIGH_MEMORY); if (zone_type <= ZONE_NORMAL) - node_set_state(nid, N_NORMAL_MEMORY); + node_set_state(pgdat->node_id, N_NORMAL_MEMORY); break; } } @@ -1887,7 +1887,7 @@ void __init free_area_init(unsigned long *max_zone_pfn) /* Any memory on that node */ if (pgdat->node_present_pages) node_set_state(nid, N_MEMORY); - check_for_memory(pgdat, nid); + check_for_memory(pgdat); } memmap_init(); -- 2.25.1