From patchwork Mon Oct 31 09:29:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 13025521 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 393B8FA3740 for ; Mon, 31 Oct 2022 09:29:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A238F6B0073; Mon, 31 Oct 2022 05:29:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D4496B0074; Mon, 31 Oct 2022 05:29:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89C486B0075; Mon, 31 Oct 2022 05:29:27 -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 661E96B0073 for ; Mon, 31 Oct 2022 05:29:27 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EC636AB191 for ; Mon, 31 Oct 2022 09:29:26 +0000 (UTC) X-FDA: 80080721532.06.C4314F7 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by imf20.hostedemail.com (Postfix) with ESMTP id 850D11C0008 for ; Mon, 31 Oct 2022 09:29:26 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id a11-20020a05600c2d4b00b003cf6f5fd9f1so1435180wmg.2 for ; Mon, 31 Oct 2022 02:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wMmXwX2kZtnLFA2mGASTAOPHlqknUPuxDlQJ9/B4KI8=; b=C9j5VF0dsTbD+JLT8ejZhxNJ2VoKSgpNNPcIfCl2vnV7DdWp2nZiCiP1z8hGuo1MGt lK5nlV88f30ryEE5zFSWSvhCWujEobt1fmnRcFeePjt/M7aP2SVYXeYyXAMZfPfUSAGT TyPSQcZcoda3c1f6mYWB5qM/6yuSnv6ObDN9G8ZS3pP4s3oUPLxIBKrxemqFblwOTz5f fIWyOI1SmUp4rEn1Yzmt3iohv8jhb3Au+AFS/W0fm8S4eA0o/V6FgemjfFvmhYAhVwgP +MNgrruqi2x8pHv49k8wfZTmGkgR2KsTBC+68fQEqpEyhjmilMd4iYGtQGCiB37fkSo9 ghJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wMmXwX2kZtnLFA2mGASTAOPHlqknUPuxDlQJ9/B4KI8=; b=UvubRBjbjDcOv7qTLJGO0n94LUXiRjnazGKaN5245nik/6SQpJ8LKpUyL9WQeaB/8A JORyM30H6YDbfErRvnrhDiueBDZZUBK5oJ/wmLBBLpU8Emcbo5GCjXvxK7TYvGZOkQa3 akbW3ULPiJ+8H4yvY+xbMelI7BsXdTJZFmUm25iJgmTGQeNZG7+4F/pNIJBJF1HtoEEr ET95IoR6LJRM/XidYXPHhherKi+rIUT6iSYiG6CcfL5lAfU1rIfO3Gy8m9u8WY9hOCp5 LxhG2NKGs1Q7Ay8etorZ0l3OXE8rvWb5P88//z9Ns0qKsHSTlN5c8u6Wq9NCpgwPwkzZ 3Iww== X-Gm-Message-State: ACrzQf22aqOfgt1Z7w0kG264jGCS5OrgbQ8p8s4+vwnUu3biiEODY3aM WNsPMdMkd5pZp1+bWDLvpsU= X-Google-Smtp-Source: AMsMyM5NXBeV83FylCy3VTrad1d5Lus1OQZ8qbxKFQB6vAVbGLMHp+Gbg8Fgf8Wdlpsn1BMiaCahoQ== X-Received: by 2002:a05:600c:19ca:b0:3c6:ee5a:45fd with SMTP id u10-20020a05600c19ca00b003c6ee5a45fdmr7387764wmq.106.1667208564832; Mon, 31 Oct 2022 02:29:24 -0700 (PDT) Received: from felia.fritz.box (200116b826c494005d8b6b3bdc900ff8.dip.versatel-1u1.de. [2001:16b8:26c4:9400:5d8b:6b3b:dc90:ff8]) by smtp.gmail.com with ESMTPSA id e15-20020adfe7cf000000b0022cc0a2cbecsm6660833wrn.15.2022.10.31.02.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 02:29:24 -0700 (PDT) From: Lukas Bulwahn To: Vlastimil Babka , Kees Cook , linux-mm@kvack.org Cc: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] mm/slab_common: repair kernel-doc for __ksize() Date: Mon, 31 Oct 2022 10:29:20 +0100 Message-Id: <20221031092920.976-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667208566; a=rsa-sha256; cv=none; b=aWSkmaMpsY0i2rJV2CeeLRl0tXS+EPGfouls21RHOakj6CEKEMCUhkS7OejoCG2vsBFy0u JwMFu3IDfzcreR/NTZVweJd7WO73H0VygWuRfBEDIJUpYS8u4pbjoA+LtKf4ZphR3jP1yy nlvVBnHslH99VAinuDw6iWtLlPR1apE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=C9j5VF0d; spf=pass (imf20.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667208566; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=wMmXwX2kZtnLFA2mGASTAOPHlqknUPuxDlQJ9/B4KI8=; b=rF4izBJXHhAGb8aGs5FtUhQDAMgb943hWNSNrplIWWx06jKIu3yHFXCQuXnLYZAFdqQu25 30wt2kwu3NHiAVqSs0ha4dywoThZvXJ5y42rMTj4Pil8b01fZK8h8bxn32oNLo0SxLof2Y wr853Kaw9kwaa+qBjjTDXp+lAHXdQoo= Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=C9j5VF0d; spf=pass (imf20.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 850D11C0008 X-Stat-Signature: w45ycphkyotc8suk5bhd8h8o9fb1pitr X-Rspam-User: X-HE-Tag: 1667208566-976073 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: Commit 445d41d7a7c1 ("Merge branch 'slab/for-6.1/kmalloc_size_roundup' into slab/for-next") resolved a conflict of two concurrent changes to __ksize(). However, it did not adjust the kernel-doc comment of __ksize(), while the name of the argument to __ksize() was renamed. Hence, ./scripts/ kernel-doc -none mm/slab_common.c warns about it. Adjust the kernel-doc comment for __ksize() for make W=1 happiness. Signed-off-by: Lukas Bulwahn Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/slab_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 33b1886b06eb..74a991fd9d31 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1010,7 +1010,7 @@ EXPORT_SYMBOL(kfree); /** * __ksize -- Report full size of underlying allocation - * @objp: pointer to the object + * @object: pointer to the object * * This should only be used internally to query the true size of allocations. * It is not meant to be a way to discover the usable size of an allocation @@ -1018,7 +1018,7 @@ EXPORT_SYMBOL(kfree); * the originally requested allocation size may trigger KASAN, UBSAN_BOUNDS, * and/or FORTIFY_SOURCE. * - * Return: size of the actual memory used by @objp in bytes + * Return: size of the actual memory used by @object in bytes */ size_t __ksize(const void *object) {