Merge branch 'slab/for-5.18/trivial' into slab/for-linus

Trivial slab code changes:
- deleting unused parameters and flags
- using helper macros and functions
- making structures static

diff --combined include/linux/slab.h
index 5b6193fd8bd9935bf2ad60b6b08e8d7e1ba8335c,b6b3eed6c7c42392ae906d190f47bd441d0b0439..0381868e511897ac8b8ad8eb3d09ffa533f2c63e
--- 1/include/linux/slab.h
--- 2/include/linux/slab.h
+++ b/include/linux/slab.h
@@@ -117,9 -117,6 +117,6 @@@
  #define SLAB_RECLAIM_ACCOUNT  ((slab_flags_t __force)0x00020000U)
  #define SLAB_TEMPORARY                SLAB_RECLAIM_ACCOUNT    /* Objects are short-lived */
  
- /* Slab deactivation flag */
- #define SLAB_DEACTIVATED      ((slab_flags_t __force)0x10000000U)
- 
  /*
   * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests.
   *
@@@ -660,7 -657,8 +657,7 @@@ static inline __alloc_size(1, 2) void *
   * allocator where we care about the real place the memory allocation
   * request comes from.
   */
 -extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller)
 -                                 __alloc_size(1);
 +extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller);
  #define kmalloc_track_caller(size, flags) \
        __kmalloc_track_caller(size, flags, _RET_IP_)