projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/entry/64: Stop using int_ret_from_sys_call in ret_from_fork
[deliverable/linux.git]
/
mm
/
slab_common.c
diff --git
a/mm/slab_common.c
b/mm/slab_common.c
index e016178063e19e86c21a46ea4a39ced03b0fe001..b50aef01ccf7ea97aa621dc63cfd66e111ee3dae 100644
(file)
--- a/
mm/slab_common.c
+++ b/
mm/slab_common.c
@@
-128,7
+128,7
@@
int __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,
return i;
}
return i;
}
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
void slab_init_memcg_params(struct kmem_cache *s)
{
s->memcg_params.is_root_cache = true;
void slab_init_memcg_params(struct kmem_cache *s)
{
s->memcg_params.is_root_cache = true;
@@
-221,7
+221,7
@@
static inline int init_memcg_params(struct kmem_cache *s,
static inline void destroy_memcg_params(struct kmem_cache *s)
{
}
static inline void destroy_memcg_params(struct kmem_cache *s)
{
}
-#endif /* CONFIG_MEMCG
_KMEM
*/
+#endif /* CONFIG_MEMCG
&& !CONFIG_SLOB
*/
/*
* Find a mergeable slab cache
/*
* Find a mergeable slab cache
@@
-477,7
+477,7
@@
static void release_caches(struct list_head *release, bool need_rcu_barrier)
}
}
}
}
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
/*
* memcg_create_kmem_cache - Create a cache for a memory cgroup.
* @memcg: The memory cgroup the new cache is for.
/*
* memcg_create_kmem_cache - Create a cache for a memory cgroup.
* @memcg: The memory cgroup the new cache is for.
@@
-503,10
+503,10
@@
void memcg_create_kmem_cache(struct mem_cgroup *memcg,
mutex_lock(&slab_mutex);
/*
mutex_lock(&slab_mutex);
/*
- * The memory cgroup could have been
deactivat
ed while the cache
+ * The memory cgroup could have been
offlin
ed while the cache
* creation work was pending.
*/
* creation work was pending.
*/
- if (!memcg_kmem_
is_activ
e(memcg))
+ if (!memcg_kmem_
onlin
e(memcg))
goto out_unlock;
idx = memcg_cache_id(memcg);
goto out_unlock;
idx = memcg_cache_id(memcg);
@@
-689,7
+689,7
@@
static inline int shutdown_memcg_caches(struct kmem_cache *s,
{
return 0;
}
{
return 0;
}
-#endif /* CONFIG_MEMCG
_KMEM
*/
+#endif /* CONFIG_MEMCG
&& !CONFIG_SLOB
*/
void slab_kmem_cache_release(struct kmem_cache *s)
{
void slab_kmem_cache_release(struct kmem_cache *s)
{
@@
-1123,7
+1123,7
@@
static int slab_show(struct seq_file *m, void *p)
return 0;
}
return 0;
}
-#if
def CONFIG_MEMCG_KMEM
+#if
defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
int memcg_slab_show(struct seq_file *m, void *p)
{
struct kmem_cache *s = list_entry(p, struct kmem_cache, list);
int memcg_slab_show(struct seq_file *m, void *p)
{
struct kmem_cache *s = list_entry(p, struct kmem_cache, list);
This page took
0.027999 seconds
and
5
git commands to generate.