36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From a209e9637eacb353adb97f29dd059e63084d30df Mon Sep 17 00:00:00 2001
|
|
From: Bart Wensley <barton.wensley@windriver.com>
|
|
Date: Tue, 9 Jul 2019 07:25:32 -0500
|
|
Subject: [PATCH 1/1] compile fix for disabling CONFIG_MEMCG_KMEM
|
|
|
|
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
|
|
---
|
|
mm/memcontrol.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
|
|
index da97e2c..68fd46b 100644
|
|
--- a/mm/memcontrol.c
|
|
+++ b/mm/memcontrol.c
|
|
@@ -2998,6 +2998,8 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg,
|
|
memcg_check_events(memcg, page);
|
|
}
|
|
|
|
+static DEFINE_MUTEX(memcg_limit_mutex);
|
|
+
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
/*
|
|
* The memcg_slab_mutex is held whenever a per memcg kmem cache is created or
|
|
@@ -3378,8 +3380,6 @@ static inline void memcg_resume_kmem_account(void)
|
|
current->memcg_kmem_skip_account--;
|
|
}
|
|
|
|
-static DEFINE_MUTEX(memcg_limit_mutex);
|
|
-
|
|
int __kmem_cache_destroy_memcg_children(struct kmem_cache *s)
|
|
{
|
|
struct kmem_cache *c;
|
|
--
|
|
1.8.3.1
|
|
|