Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBB4C415F04; Tue, 21 Jul 2026 20:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664545; cv=none; b=FJkHrPvomPRR2mWzlj4k7juzIhU/ZooZTtcBZE0gFwbHnqIHJ5NrSOxMmXZw/YXouWiLlX8EMewFYAq6VwSWDvwkqAOPRrqdt81Fy4Kh9vrsuyPUvd+oBJDfCLSTXuoKbytDpGp6i16BAqT+UzaYTHbqDe61KRagG3CJenIrCiI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664545; c=relaxed/simple; bh=plJJZ2Svaaii50vM5JDvrRqM2RexYvQOZZ7f4DkWcFg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pbMCvMzk7s7VN3JL+mbUsLPYo8LTARO0QoXmLg+8zxemiM+F8sJgcRpGIp0hE9D8FnDLn1k3WTmKWAklzBN9C84xu5VerdAixBUtWK57v/mqbqY1Wgev199138eo2WmajqghOeI5EWjfl3ulgySN0e3Mf5Fds39H6KymzQxC8qo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vwUohNjs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vwUohNjs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 261A01F000E9; Tue, 21 Jul 2026 20:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784664543; bh=RLAZgj+2YRMFerleSkH68NjUHAKivJOAZIPRZyK5OUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vwUohNjsfz/sdQxvMt47m/A+gaDUCFn/hQHmpatagzJI6Dl8PZPRDIk7g4YZmg8nb J5EZX0yAkVHfpcmMptO1DMuwn4EB4ls+6g977jNtv86Nlk+xqQFjokGDhKCgW9vLYw NxmCTB1UH5hB3ingd67QAkIMSHSp/4Fr8CZecv+I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Randy Dunlap , "Harry Yoo (Oracle)" , "Vlastimil Babka (SUSE)" , Eric Biggers Subject: [PATCH 6.12 1238/1276] slab: recognize @GFP parameter as optional in kernel-doc Date: Tue, 21 Jul 2026 17:28:01 +0200 Message-ID: <20260721152513.795888350@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap commit 7b5f5865fb11e60edd03c5e063e2d228b7062317 upstream. Since the @GFP parameter in kmalloc_obj() etc. is now optional, change the kernel-doc to indicate that it is optional. This avoids kernel-doc warnings: WARNING: include/linux/slab.h:1101 Excess function parameter 'GFP' description in 'kmalloc_obj' WARNING: include/linux/slab.h:1113 Excess function parameter 'GFP' description in 'kmalloc_objs' WARNING: include/linux/slab.h:1128 Excess function parameter 'GFP' description in 'kmalloc_flex' Fixes: e19e1b480ac7 ("add default_gfp() helper macro and use it in the new *alloc_obj() helpers") Signed-off-by: Randy Dunlap Acked-by: Harry Yoo (Oracle) Link: https://patch.msgid.link/20260617163125.2716279-1-rdunlap@infradead.org Signed-off-by: Vlastimil Babka (SUSE) Signed-off-by: Eric Biggers Signed-off-by: Greg Kroah-Hartman --- include/linux/slab.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -924,7 +924,7 @@ static __always_inline __alloc_size(1) v /** * kmalloc_obj - Allocate a single instance of the given type * @VAR_OR_TYPE: Variable or type to allocate. - * @GFP: GFP flags for the allocation. + * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified). * * Returns: newly allocated pointer to a @VAR_OR_TYPE on success, or NULL * on failure. @@ -936,7 +936,7 @@ static __always_inline __alloc_size(1) v * kmalloc_objs - Allocate an array of the given type * @VAR_OR_TYPE: Variable or type to allocate an array of. * @COUNT: How many elements in the array. - * @GFP: GFP flags for the allocation. + * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified). * * Returns: newly allocated pointer to array of @VAR_OR_TYPE on success, * or NULL on failure. @@ -949,7 +949,7 @@ static __always_inline __alloc_size(1) v * @VAR_OR_TYPE: Variable or type to allocate (with its flex array). * @FAM: The name of the flexible array member of the structure. * @COUNT: How many flexible array member elements are desired. - * @GFP: GFP flags for the allocation. + * @...: optional GFP flags for the allocation (GFP_KERNEL when not specified). * * Returns: newly allocated pointer to @VAR_OR_TYPE on success, NULL on * failure. If @FAM has been annotated with __counted_by(), the allocation