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 81A2AC8302D for ; Mon, 30 Jun 2025 17:19:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6B038D0006; Mon, 30 Jun 2025 13:19:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1B648D0001; Mon, 30 Jun 2025 13:19:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0AA58D0006; Mon, 30 Jun 2025 13:19:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8D34B8D0001 for ; Mon, 30 Jun 2025 13:19:38 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3166C123879 for ; Mon, 30 Jun 2025 17:19:38 +0000 (UTC) X-FDA: 83612728836.25.B8C5F20 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) by imf07.hostedemail.com (Postfix) with ESMTP id 5C62E40012 for ; Mon, 30 Jun 2025 17:19:36 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sfa9lqFa; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of thorsten.blum@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=thorsten.blum@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751303976; a=rsa-sha256; cv=none; b=GMfENea3ptIwxWvNZFfZQIvrPBzoAbR0JpdFE5p04pR61eKubH2tNXCAo7NaSPlJeeMZDX a9OehbPf0v7mQV2qeOAzFem2eWYZRnGLb1zcZXV1gXdkYRTvbYhJy0UJkjpAggzbFlxuSF EYrofaS/c0NlPuVLsMDCxKQHVnQ2AZk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=sfa9lqFa; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf07.hostedemail.com: domain of thorsten.blum@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=thorsten.blum@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751303976; 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=ZmI8nMByS0MXzzMaQIPrJcZVorXLee3dlktB3PSrEP0=; b=srN3pmxjNtyzh7nauzNmMA/x+1WgAEvq3Iw+kK/4VnJgW2af8yi445mCF4Ec7l1dc7EW9z 0uj/cyGg2aTcDDsB6kozsK2h+rNBUjB0wKLAMK46PHnhxrSd3VXveD97FRwrUd7gA62gZQ IpUmZET1HQLbbPCiji2QKBmpWeAsTUA= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751303974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZmI8nMByS0MXzzMaQIPrJcZVorXLee3dlktB3PSrEP0=; b=sfa9lqFaUMBM9emwrwz94QaLMN2gwynIpjJeVKl1ifv658ZJtuZZFR77Yh6RUGlEHJ4+O3 C062OZVr6uEAWFgKmub7e69Ey7ZuN3SMDfZOn2ylJ+x2r7PqWBExdehfp0H1mf63cDici0 vgyi2rCtTWFDOc4w1Y8Gm9+el0vu4V8= From: Thorsten Blum To: Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton Cc: Thorsten Blum , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/hugetlb: Use str_plural() in report_hugepages() Date: Mon, 30 Jun 2025 19:18:26 +0200 Message-ID: <20250630171826.114008-2-thorsten.blum@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: wmjej9a8djmjn6bb35gd7xrxty37a75j X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 5C62E40012 X-Rspam-User: X-HE-Tag: 1751303976-473863 X-HE-Meta: U2FsdGVkX18VGOHYqIylbCZfwy77/DEMdmMP/5HtfXaXShWaOJFgQogmb0bJcVuwUo9PIXDceds9di3L5vrdpAPJEPUfgbqe695lBFOdZh37IZjvpvv7tR+zaxna6/z4VcRaNiT3uX6hDvrcBagvT9Ijivzlo2ewYAt7Qq9cB3SwzC/TGyKu9vBd9zWiAYn3AsuiErCe/hWOmX5Qhib8tu0OOoaRzGeUUD8c3NH5G0WJEPUaC0KHKdYO35BOoyRTOxsxC9j6NcLiWpUD2/71/jmEAq/T3nRMWIbe8nwSG1UcbBCBeMe87PJTkEQ3xQncjQXlV1voeRlRUgt5Td7FTeyOLtAFJ+hCMts8FqwNZOSNVEhPFl7C+J3nFPd/qnnpsqi6modfMH+KSX6lSm+I+kunyJdLtDfzQ9/YAr1bwnXJPrDFX84IMj6eztV6SQ/4fdxbB0yu5XDaNkgF7lJtLm94PrOU260U36a+mgDqJNBHBeGBc/7IYB+6A81a8wt9wgQo+L0bjCDJoH6CAuVKasWRyFTIbIOg4rjOFFaBjNPs+FjUUOYGTePeUnbWHOkMwT65dMXr0V+lV8DKVmXb2hxgwFzQRAJX7cocH3a7Mp+U+QRvcMBK7G9F15TGv5/TokzpmohHdtcFYX2v1ACdDFuprypB20ikrbk8CyLmG3xrf+Lds/XQsy45XP4u0JO8ucWW794MCbQwHe6BAAEViG6S7i1JfRF7vMQWVy6tWWgKvDLNdxlA+tCHTGrBETjmQKE1TOCc9Bg4wSGVCHbv8iCVxlqsqxtMApSQj9jxKVZW1C/Z+/PdHZCQwZ2tzXk7iepY2dWuMMl6BPasi0g4q5w5CWEIJu7Lcd3T3/mJkZp62/tJvB8F93wQCMaXKGOBzLAo2RoMOsT3cyLmoXgteItxoCTD7WZjimSbCSSt42EYwd+7Xw6ROrG2V/8aB7vmKV8j1RAeIJZfu2Ti98C Bjjri6o5 1qFWbZXH3N3p/RDU= 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: Use the string choice helper function str_plural() to simplify the code and to fix the following Coccinelle/coccicheck warning reported by string_choices.cocci: opportunity for str_plural(nrinvalid) Signed-off-by: Thorsten Blum --- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9dc95eac558c..08abe7395f2f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -3724,7 +3725,7 @@ static void __init report_hugepages(void) buf, h->nr_huge_pages); if (nrinvalid) pr_info("HugeTLB: %s page size: %lu invalid page%s discarded\n", - buf, nrinvalid, nrinvalid > 1 ? "s" : ""); + buf, nrinvalid, str_plural(nrinvalid)); pr_info("HugeTLB: %d KiB vmemmap can be freed for a %s page\n", hugetlb_vmemmap_optimizable_size(h) / SZ_1K, buf); } -- 2.50.0