projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
squash mm: Export migrate_page_... : also make it non-static
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
mm
/
slab_common.c
diff --git
a/mm/slab_common.c
b/mm/slab_common.c
index ff3218a0f5e14029aab5c23dd323f447d2a86173..7d21d3fddbf0427deada294d606de29930ff9694 100644
(file)
--- 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;
}
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
/*
* 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;
}
s = NULL;
return -EINVAL;
}
+#endif
}
WARN_ON(strchr(name, ' ')); /* It confuses parsers */
}
WARN_ON(strchr(name, ' ')); /* It confuses parsers */
@@
-373,8
+375,10
@@
struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
{
int index;
{
int index;
- if (WARN_ON_ONCE(size > KMALLOC_MAX_SIZE))
+ if (size > KMALLOC_MAX_SIZE) {
+ WARN_ON_ONCE(!(flags & __GFP_NOWARN));
return NULL;
return NULL;
+ }
if (size <= 192) {
if (!size)
if (size <= 192) {
if (!size)