[folded-merged] mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems-fix-fix.patch removed from -mm tree

The quilt patch titled
     Subject: mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems-fix-fix
has been removed from the -mm tree.  Its filename was
     mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems-fix-fix.patch

This patch was dropped because it was folded into mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems.patch

------------------------------------------------------
From: Andrew Morton <[email protected]>
Subject: mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems-fix-fix
Date: Wed Jul  1 03:52:15 PM PDT 2026

fix obj_to_class_idx() warning yet again

Reported-by: kernel test robot <[email protected]>
Link: https://lore.kernel.org/[email protected]
Cc: Barry Song <[email protected]>
Cc: Joshua Hahn <[email protected]>
Cc: Minchan Kim <[email protected]>
Cc: Nhat Pham <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Wenchao Hao <[email protected]>
Cc: Xueyuan Chen <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

 mm/zsmalloc.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/mm/zsmalloc.c~mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems-fix-fix
+++ a/mm/zsmalloc.c
@@ -1457,11 +1457,13 @@ static void obj_free(int class_size, uns
 	mod_zspage_inuse(zspage, -1);
 }
 
+#if (ZS_OBJ_CLASS_BITS > 0) || defined(CONFIG_COMPACTION)
 /* Folds to 0 when ZS_OBJ_CLASS_BITS == 0; no ifdef needed at callers. */
 static unsigned int obj_to_class_idx(unsigned long obj)
 {
 	return (obj >> ZS_OBJ_IDX_BITS) & ZS_OBJ_CLASS_MASK;
 }
+#endif
 
 /*
  * Resolve @handle to its zspage / size_class and acquire class->lock.
_

Patches currently in -mm which might be from [email protected] are

csky-implement-flush_cache_vmap-in-c.patch
mm-zsmalloc-drop-pool-lock-from-zs_free-on-64-bit-systems.patch
mm-rmap-use-huge_ptep_get-in-try_to_migrate_one-checkpatch-fixes.patch
mm-mprotect-use-huge_ptep_get-for-hugetlb-fix.patch
mm-drop-stale-folio_ref_count==1-check-in-do_swap_page-reuse-logic-fix.patch
alloc_tag-add-ioctl-to-proc-allocinfo-fix.patch
mm-hmm-make-config_hmm_mirror-select-config_mmu_notifier.patch
mm-vma-add-and-use-vma__pgoff-fix.patch
drivers-media-v4l2-core-v4l2-vp9c-reduce-inlining.patch