foo

1 files changed, 8 insertions, 20 deletions

diff --git a/patches/rhashtable-plumb-through-alloc-tag.patch b/patches/rhashtable-plumb-through-alloc-tag.patch
index 54806414d..2748ff334 100644
--- a/patches/rhashtable-plumb-through-alloc-tag.patch
+++ b/patches/rhashtable-plumb-through-alloc-tag.patch
@@ -5,6 +5,8 @@ Date: Thu, 21 Mar 2024 09:36:53 -0700
 This gives better memory allocation profiling results; rhashtable
 allocations will be accounted to the code that initialized the rhashtable.
 
+[surenb@google.com: undo _noprof additions in the documentation]
+  Link: https://lkml.kernel.org/r/20240326231453.1206227-1-surenb@google.com
 Link: https://lkml.kernel.org/r/20240321163705.3067592-32-surenb@google.com
 Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
 Signed-off-by: Suren Baghdasaryan <surenb@google.com>
@@ -30,8 +32,8 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 
  include/linux/alloc_tag.h        |    3 +++
  include/linux/rhashtable-types.h |   11 +++++++++--
- lib/rhashtable.c                 |   28 +++++++++++++++++-----------
- 3 files changed, 29 insertions(+), 13 deletions(-)
+ lib/rhashtable.c                 |   22 ++++++++++++++--------
+ 3 files changed, 26 insertions(+), 10 deletions(-)
 
 --- a/include/linux/alloc_tag.h~rhashtable-plumb-through-alloc-tag
 +++ a/include/linux/alloc_tag.h
@@ -120,15 +122,6 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  
  	size = nbuckets;
  
-@@ -975,7 +979,7 @@ static u32 rhashtable_jhash2(const void
- }
- 
- /**
-- * rhashtable_init - initialize a new hash table
-+ * rhashtable_init_noprof - initialize a new hash table
-  * @ht:		hash table to be initialized
-  * @params:	configuration parameters
-  *
 @@ -1016,7 +1020,7 @@ static u32 rhashtable_jhash2(const void
   *	.obj_hashfn = my_hash_fn,
   * };
@@ -147,7 +140,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  	if (params->min_size)
  		ht->p.min_size = roundup_pow_of_two(params->min_size);
  
-@@ -1076,26 +1082,26 @@ int rhashtable_init(struct rhashtable *h
+@@ -1076,7 +1082,7 @@ int rhashtable_init(struct rhashtable *h
  
  	return 0;
  }
@@ -155,15 +148,10 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 +EXPORT_SYMBOL_GPL(rhashtable_init_noprof);
  
  /**
-- * rhltable_init - initialize a new hash list table
-+ * rhltable_init_noprof - initialize a new hash list table
-  * @hlt:	hash list table to be initialized
-  * @params:	configuration parameters
-  *
-  * Initializes a new hash list table.
+  * rhltable_init - initialize a new hash list table
+@@ -1087,15 +1093,15 @@ EXPORT_SYMBOL_GPL(rhashtable_init);
   *
-- * See documentation for rhashtable_init.
-+ * See documentation for rhashtable_init_noprof.
+  * See documentation for rhashtable_init.
   */
 -int rhltable_init(struct rhltable *hlt, const struct rhashtable_params *params)
 +int rhltable_init_noprof(struct rhltable *hlt, const struct rhashtable_params *params)