From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 05:07:07 +0000 (+1100)
Subject: Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka... 
X-Git-Tag: next-20250225~12
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=4030e0eb4d7dc4f1cef4c62ed175d5578cbd18ff;p=linux%2F.git

Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git

# Conflicts:
#	kernel/rcu/tiny.c
---

4030e0eb4d7dc4f1cef4c62ed175d5578cbd18ff
diff --cc kernel/rcu/tiny.c
index 8a52aca686a5,7a34a99d4664..c1ebfd51768b
--- a/kernel/rcu/tiny.c
+++ b/kernel/rcu/tiny.c
@@@ -246,31 -232,6 +232,20 @@@ bool poll_state_synchronize_rcu(unsigne
  }
  EXPORT_SYMBOL_GPL(poll_state_synchronize_rcu);
  
- #ifdef CONFIG_KASAN_GENERIC
- void kvfree_call_rcu(struct rcu_head *head, void *ptr)
- {
- 	if (head)
- 		kasan_record_aux_stack(ptr);
- 
- 	__kvfree_call_rcu(head, ptr);
- }
- EXPORT_SYMBOL_GPL(kvfree_call_rcu);
- #endif
- 
 +#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST)
 +unsigned long long rcutorture_gather_gp_seqs(void)
 +{
 +	return READ_ONCE(rcu_ctrlblk.gp_seq) & 0xffffULL;
 +}
 +EXPORT_SYMBOL_GPL(rcutorture_gather_gp_seqs);
 +
 +void rcutorture_format_gp_seqs(unsigned long long seqs, char *cp, size_t len)
 +{
 +	snprintf(cp, len, "g%04llx", seqs & 0xffffULL);
 +}
 +EXPORT_SYMBOL_GPL(rcutorture_format_gp_seqs);
 +#endif
 +
  void __init rcu_init(void)
  {
  	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);