X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=mm%2Fslab_common.c;h=7d21d3fddbf0427deada294d606de29930ff9694;hb=b4350432998578500203d562d5b093c6a5beadd2;hp=2d414508e9ecb32e64df911c72bf0dd2682b87b8;hpb=fd58b517e593ed4f54d8c8b47613928c2066c046;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 2d414508e9ec..7d21d3fddbf0 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -55,6 +55,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
 			continue;
 		}
 
+#if !defined(CONFIG_SLUB)
 		/*
 		 * For simplicity, we won't check this in the list of memcg
 		 * caches. We have control over memcg naming, and if there
@@ -68,6 +69,7 @@ static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
 			s = NULL;
 			return -EINVAL;
 		}
+#endif
 	}
 
 	WARN_ON(strchr(name, ' '));	/* It confuses parsers */