projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpio: rcar: Use ARCH_RENESAS
[deliverable/linux.git]
/
mm
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index b21fd24b08b1fc886a4d43ca8930e84a810bb5ea..2e1355ac056b02a51778b2b1eef770b276626309 100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-5207,7
+5207,7
@@
static ssize_t slab_attr_store(struct kobject *kobj,
return -EIO;
err = attribute->store(s, buf, len);
return -EIO;
err = attribute->store(s, buf, len);
-#ifdef CONFIG_MEMCG
_KMEM
+#ifdef CONFIG_MEMCG
if (slab_state >= FULL && err >= 0 && is_root_cache(s)) {
struct kmem_cache *c;
if (slab_state >= FULL && err >= 0 && is_root_cache(s)) {
struct kmem_cache *c;
@@
-5242,7
+5242,7
@@
static ssize_t slab_attr_store(struct kobject *kobj,
static void memcg_propagate_slab_attrs(struct kmem_cache *s)
{
static void memcg_propagate_slab_attrs(struct kmem_cache *s)
{
-#ifdef CONFIG_MEMCG
_KMEM
+#ifdef CONFIG_MEMCG
int i;
char *buffer = NULL;
struct kmem_cache *root_cache;
int i;
char *buffer = NULL;
struct kmem_cache *root_cache;
@@
-5328,7
+5328,7
@@
static struct kset *slab_kset;
static inline struct kset *cache_kset(struct kmem_cache *s)
{
static inline struct kset *cache_kset(struct kmem_cache *s)
{
-#ifdef CONFIG_MEMCG
_KMEM
+#ifdef CONFIG_MEMCG
if (!is_root_cache(s))
return s->memcg_params.root_cache->memcg_kset;
#endif
if (!is_root_cache(s))
return s->memcg_params.root_cache->memcg_kset;
#endif
@@
-5405,7
+5405,7
@@
static int sysfs_slab_add(struct kmem_cache *s)
if (err)
goto out_del_kobj;
if (err)
goto out_del_kobj;
-#ifdef CONFIG_MEMCG
_KMEM
+#ifdef CONFIG_MEMCG
if (is_root_cache(s)) {
s->memcg_kset = kset_create_and_add("cgroup", NULL, &s->kobj);
if (!s->memcg_kset) {
if (is_root_cache(s)) {
s->memcg_kset = kset_create_and_add("cgroup", NULL, &s->kobj);
if (!s->memcg_kset) {
@@
-5438,7
+5438,7
@@
void sysfs_slab_remove(struct kmem_cache *s)
*/
return;
*/
return;
-#ifdef CONFIG_MEMCG
_KMEM
+#ifdef CONFIG_MEMCG
kset_unregister(s->memcg_kset);
#endif
kobject_uevent(&s->kobj, KOBJ_REMOVE);
kset_unregister(s->memcg_kset);
#endif
kobject_uevent(&s->kobj, KOBJ_REMOVE);
This page took
0.024869 seconds
and
5
git commands to generate.