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 9A660C54E58 for ; Thu, 14 Mar 2024 01:14:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B6418D0037; Wed, 13 Mar 2024 21:14:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 166D380073; Wed, 13 Mar 2024 21:14:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02E338D006F; Wed, 13 Mar 2024 21:13:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EA79D8D0037 for ; Wed, 13 Mar 2024 21:13:59 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B6FEDC0839 for ; Thu, 14 Mar 2024 01:13:59 +0000 (UTC) X-FDA: 81893872998.02.9FB865E Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf24.hostedemail.com (Postfix) with ESMTP id EFE2A18001A for ; Thu, 14 Mar 2024 01:13:56 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710378838; a=rsa-sha256; cv=none; b=VN53VgM9j8zjjUbtPgx+GRy36z3qTQ/MPXlWLB40l9nLQAC0Spf1KSG7EziBim4nfTmYJW JpnLKkyXwm/vPRt0IyLu0FAYPg47dt9evDLcHc2z/ssiHrBJD/8sjvUd3kvSGR2Qq+f6EW o1/ym+wiZDLej4CNpurNzSmCHIdqUYo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710378838; 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:in-reply-to:references:references; bh=V3vu+POQHTRpHtAGRrucK6MZ4JV90EW6doqbyWUseNg=; b=YkXVfIs5iZC6Fdp1oR6iHHo/aStRYT9KCR1xzQ9b+Ua/NYekge0ltEOcL7YWiq/N3aEMva be+oJwmkwUrs72kdqdNPnSmvAyo0QdFJrAos/FVVQMStt47QBN9P23plHyf/o0g5BW4ufP rHeofQqvC/pyYedslCGmo+vPXzAoPx0= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Tw8Wm63xGz1vwbL; Thu, 14 Mar 2024 09:13:08 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 58AC61A0172; Thu, 14 Mar 2024 09:13:52 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 14 Mar 2024 09:13:51 +0800 Message-ID: Date: Thu, 14 Mar 2024 09:13:51 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/3] mm/show_mem: simplify ifdef on si_meminfo_node() To: Luis Chamberlain , , , , , CC: , , , References: <20240314005436.2962962-1-mcgrof@kernel.org> <20240314005436.2962962-2-mcgrof@kernel.org> Content-Language: en-US From: Kefeng Wang In-Reply-To: <20240314005436.2962962-2-mcgrof@kernel.org> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: EFE2A18001A X-Stat-Signature: ehine8q6mt7yk3pmnyimf4kngybp8n4d X-Rspam-User: X-HE-Tag: 1710378836-987217 X-HE-Meta: U2FsdGVkX1995MluE3JpGIVkpOQVGg/SfiKQgDN9uFpeWsSsYGKpJwVyDD8FZdFvYyPkQQdJjr3I39JpLFaRNm10PeTP2xk74OCjJrZHz+AQCZhike9jPjG6HlztT9Vu/TtPneeG6SCvH1v/isRfNqStOOM+GhHPhSdp1d/j3eKiUowCsKJYcEV5K7h5O8OzQQkHPr924jB7nS5sDMgg25+zL38qJliL/wlhbalZWyJfDqkeWleYMcIy6ye1NVYOBfgwT1ojfkILEK1PU8tQqYGljf1WNgu+PFpG75LEwri2gur2fRkhGvSFsLuzZdA/xtkdpUok1Sfqb7okW7heBVhBz/+JvsypVFzzmw2+vq3weNnu58X+LkKbDP0SEC0rKHVgM4YvG4B03FLEIoF8cOiWydfmZWUzwbh1BQxRsUiAEBaPdwI0T7mTDvQyGZkL81s1fZWocoYKEeLGwYBAuC4vMshi2IfrKlb61SmxOUk4tJmp+NmQAWUEexyEb1q5rqFl/Uq7dv3r/xaDtEeCzIdE6odJVeo+KDAFOhX+M8SbCDwVed2lR1hpbmDJOTSCrSEeqDovVy2rXV0/khVUo7cXMQd0lZyom06SiJ69j1GCAktnhu00CbGhqRz9MBUSEOaE8GMdjH+hb+/VOu7lVUZyA3yVZ5KNzEEGSgE1efpj4aHMwZmIsP/smbOk9efkDqBdO94hzRkCohkpkPWLnV/NAKwiiMEX/EgM7ANpB2BB2meaYisqY1XuqfC4J92/CUQWG3E4I6ubar+SxtNI50oz804YzHvPtXAQMOPHPZdLQ4zSg0zOen3A370i2YD7OmivCyKQ5gcf7zyBekaWPVNuhP7LuWBovCsGI/mnPUbpSBBsbRgiS6+3EFfGk5n7zT+hwe4ts60= 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: On 2024/3/14 8:54, Luis Chamberlain wrote: > There is an ifdef where the same exact values are used at > the end, so remove the else and keep the same values for both > conditions. > > Signed-off-by: Luis Chamberlain > --- > mm/show_mem.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/mm/show_mem.c b/mm/show_mem.c > index 8dcfafbd283c..529d2f9b6410 100644 > --- a/mm/show_mem.c > +++ b/mm/show_mem.c > @@ -108,12 +108,9 @@ void si_meminfo_node(struct sysinfo *val, int nid) > free_highpages += zone_page_state(zone, NR_FREE_PAGES); > } > } > +#endif > val->totalhigh = managed_highpages; > val->freehigh = free_highpages; > -#else > - val->totalhigh = managed_highpages; > - val->freehigh = free_highpages; > -#endif > val->mem_unit = PAGE_SIZE; > } > #endif More cleanup? diff --git a/mm/show_mem.c b/mm/show_mem.c index 8dcfafbd283c..44dd6d6e9488 100644 --- a/mm/show_mem.c +++ b/mm/show_mem.c @@ -94,26 +94,21 @@ void si_meminfo_node(struct sysinfo *val, int nid) unsigned long free_highpages = 0; pg_data_t *pgdat = NODE_DATA(nid); - for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++) - managed_pages += zone_managed_pages(&pgdat->node_zones[zone_type]); - val->totalram = managed_pages; - val->sharedram = node_page_state(pgdat, NR_SHMEM); - val->freeram = sum_zone_node_page_state(nid, NR_FREE_PAGES); -#ifdef CONFIG_HIGHMEM for (zone_type = 0; zone_type < MAX_NR_ZONES; zone_type++) { struct zone *zone = &pgdat->node_zones[zone_type]; + managed_pages += zone_managed_pages(zone); if (is_highmem(zone)) { managed_highpages += zone_managed_pages(zone); free_highpages += zone_page_state(zone, NR_FREE_PAGES); } } + + val->totalram = managed_pages; + val->sharedram = node_page_state(pgdat, NR_SHMEM); + val->freeram = sum_zone_node_page_state(nid, NR_FREE_PAGES); val->totalhigh = managed_highpages; val->freehigh = free_highpages; -#else - val->totalhigh = managed_highpages; - val->freehigh = free_highpages; -#endif val->mem_unit = PAGE_SIZE; }