mm-memcg-slab-move-memcg_kmem_bypass-to-memcontrolh.patch removed from -mm tree
The patch titled
Subject: mm: memcg/slab: move memcg_kmem_bypass() to memcontrol.h
has been removed from the -mm tree. Its filename was
mm-memcg-slab-move-memcg_kmem_bypass-to-memcontrolh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Roman Gushchin <[email protected]>
Subject: mm: memcg/slab: move memcg_kmem_bypass() to memcontrol.h
To make the memcg_kmem_bypass() function available outside of the memcontrol.c, let's move it to memcontrol.h. The function is small and nicely fits into static inline sort of functions.
It will be used from the slab code.
---
include/linux/memcontrol.h | 12 ++++++++++++ mm/memcontrol.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcg-slab-move-memcg_kmem_bypass-to-memcontrolh +12 -0
@@ -1440,6 +1440,18 @@ static inline bool memcg_kmem_enabled(voreturn static_branch_unlikely (&memcg_kmem_enabled_key); } +static inline bool memcg_kmem_bypass (void ) +{ +if (in_interrupt ()) +return true; + +/* Allow remote memcg charging in kthread contexts. */ +if ((!current->mm || (current->flags &PF_KTHREAD )) && + !current->active_memcg) +return true; +return false; +} +static inline int memcg_kmem_charge_page (struct page *page,gfp_t gfp,int order) {
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-slab-move-memcg_kmem_bypass-to-memcontrolh +0 -12
@@ -2945,18 +2945,6 @@ static void memcg_schedule_kmem_cache_crqueue_work (memcg_kmem_cache_wq, &cw->work); } -static inline bool memcg_kmem_bypass (void ) -{ -if (in_interrupt ()) -return true; - -/* Allow remote memcg charging in kthread contexts. */ -if ((!current->mm || (current->flags &PF_KTHREAD )) && - !current->active_memcg) -return true; -return false; -} -/** * memcg_kmem_get_cache: select the correct per-memcg cache for allocation * @cachep: the original global kmem cache
_
Patches currently in -mm which might be from [email protected] are
percpu-return-number-of-released-bytes-from-pcpu_free_area.patch mm-memcg-percpu-account-percpu-memory-to-memory-cgroups.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics.patch mm-memcg-percpu-per-memcg-percpu-memory-statistics-v3.patch mm-memcg-charge-memcg-percpu-memory-to-the-parent-cgroup.patch kselftests-cgroup-add-perpcu-memory-accounting-test.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch