mm-swap_cgroup-remove-swap_cgroup_cmpxchg.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap_cgroup: remove swap_cgroup_cmpxchg
has been removed from the -mm tree. Its filename was
mm-swap_cgroup-remove-swap_cgroup_cmpxchg.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm/swap_cgroup: remove swap_cgroup_cmpxchg
Date: Wed, 18 Dec 2024 19:46:31 +0800
This function is never used after commit 6b611388b626 ("memcg-v1: remove charge move code").
---
include/linux/swap_cgroup.h | 2 -- mm/swap_cgroup.c | 29 ----------------------------- 2 files changed, 31 deletions(-)
include/linux/swap_cgroup.h renamed from include/linux/swap_cgroup.h~mm-swap_cgroup-remove-swap_cgroup_cmpxchg +0 -2
@@ -6,8 +6,6 @@#if defined(CONFIG_MEMCG ) && defined(CONFIG_SWAP ) -extern unsigned short swap_cgroup_cmpxchg (swp_entry_t ent, -unsigned short old,unsigned short new);extern unsigned short swap_cgroup_record (swp_entry_t ent,unsigned short id,unsigned int nr_ents);extern unsigned short lookup_swap_cgroup_id (swp_entry_t ent);
mm/swap_cgroup.c renamed from mm/swap_cgroup.c~mm-swap_cgroup-remove-swap_cgroup_cmpxchg +0 -29
@@ -46,35 +46,6 @@ static struct swap_cgroup *lookup_swap_c }/** -* swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. -* @ent: swap entry to be cmpxchged -* @old: old id -* @new: new id -* -* Returns old id at success, 0 at failure. -* (There is no mem_cgroup using 0 as its id) -*/ -unsigned short swap_cgroup_cmpxchg (swp_entry_t ent, -unsigned short old,unsigned short new) -{ -struct swap_cgroup_ctrl *ctrl; -struct swap_cgroup *sc; -unsigned long flags; -unsigned short retval; - - sc =lookup_swap_cgroup (ent, &ctrl); - -spin_lock_irqsave (&ctrl->lock, flags); - retval = sc->id; -if (retval == old) - sc->id = new; -else - retval =0 ; -spin_unlock_irqrestore (&ctrl->lock, flags); -return retval; -} - -/** * swap_cgroup_record - record mem_cgroup for a set of swap entries * @ent: the first swap entry to be recorded into * @id: mem_cgroup to be recorded
_
Patches currently in -mm which might be from [email protected] are
mm-swap-minor-clean-up-for-swap-entry-allocation.patch mm-swap-fold-swap_info_get_cont-in-the-only-caller.patch mm-swap-remove-old-allocation-path-for-hdd.patch mm-swap-use-cluster-lock-for-hdd.patch mm-swap-clean-up-device-availability-check.patch mm-swap-clean-up-plist-removal-and-adding.patch mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage.patch mm-swap-use-an-enum-to-define-all-cluster-flags-and-wrap-flags-changes.patch mm-swap-reduce-contention-on-device-lock.patch mm-swap-simplify-percpu-cluster-updating.patch mm-swap-introduce-a-helper-for-retrieving-cluster-from-offset.patch mm-swap-use-a-global-swap-cluster-for-non-rotation-devices.patch mm-swap_slots-remove-slot-cache-for-freeing-path.patch