* [PATCH] mm/slab_common: repair kernel-doc for __ksize()
@ 2022-10-31 9:29 Lukas Bulwahn
2022-10-31 11:10 ` Hyeonggon Yoo
2022-11-03 17:11 ` Vlastimil Babka
0 siblings, 2 replies; 3+ messages in thread
From: Lukas Bulwahn @ 2022-10-31 9:29 UTC (permalink / raw)
To: Vlastimil Babka, Kees Cook, linux-mm
Cc: Christoph Lameter, Pekka Enberg, David Rientjes, Joonsoo Kim,
Andrew Morton, Roman Gushchin, Hyeonggon Yoo, kernel-janitors,
linux-kernel, Lukas Bulwahn
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 <lukas.bulwahn@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)
{
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm/slab_common: repair kernel-doc for __ksize()
2022-10-31 9:29 [PATCH] mm/slab_common: repair kernel-doc for __ksize() Lukas Bulwahn
@ 2022-10-31 11:10 ` Hyeonggon Yoo
2022-11-03 17:11 ` Vlastimil Babka
1 sibling, 0 replies; 3+ messages in thread
From: Hyeonggon Yoo @ 2022-10-31 11:10 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: Vlastimil Babka, Kees Cook, linux-mm, Christoph Lameter,
Pekka Enberg, David Rientjes, Joonsoo Kim, Andrew Morton,
Roman Gushchin, kernel-janitors, linux-kernel
On Mon, Oct 31, 2022 at 10:29:20AM +0100, Lukas Bulwahn wrote:
> 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 <lukas.bulwahn@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)
> {
> --
> 2.17.1
Acked-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Thanks!
--
Thanks,
Hyeonggon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm/slab_common: repair kernel-doc for __ksize()
2022-10-31 9:29 [PATCH] mm/slab_common: repair kernel-doc for __ksize() Lukas Bulwahn
2022-10-31 11:10 ` Hyeonggon Yoo
@ 2022-11-03 17:11 ` Vlastimil Babka
1 sibling, 0 replies; 3+ messages in thread
From: Vlastimil Babka @ 2022-11-03 17:11 UTC (permalink / raw)
To: Lukas Bulwahn, Kees Cook, linux-mm
Cc: Christoph Lameter, Pekka Enberg, David Rientjes, Joonsoo Kim,
Andrew Morton, Roman Gushchin, Hyeonggon Yoo, kernel-janitors,
linux-kernel
On 10/31/22 10:29, Lukas Bulwahn wrote:
> 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 <lukas.bulwahn@gmail.com>
Thanks! Adding to slab/for-6.1-rc4/fixes
Vlastimil
> ---
> 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)
> {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-03 17:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-31 9:29 [PATCH] mm/slab_common: repair kernel-doc for __ksize() Lukas Bulwahn
2022-10-31 11:10 ` Hyeonggon Yoo
2022-11-03 17:11 ` Vlastimil Babka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).