diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 11:07:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 11:07:39 +0000 |
| commit | cc1aba63160a29830b9184204e4b2fb96ba47a08 (patch) | |
| tree | 3bfc9df8f2fd1c6d738026888e2e4dbc2d1e81e9 /mm | |
| parent | 8c227d3b86c422e71dae2c2022b29c777f814357 (diff) | |
| parent | 4421cbec4387a2003646b061bf2210b268997444 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 57707f01bcf..c34bd44e8be 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1201,8 +1201,8 @@ static unsigned long kmem_cache_flags(unsigned long object_size, /* * Enable debugging if selected on the kernel commandline. */ - if (slub_debug && (!slub_debug_slabs || - !strncmp(slub_debug_slabs, name, strlen(slub_debug_slabs)))) + if (slub_debug && (!slub_debug_slabs || (name && + !strncmp(slub_debug_slabs, name, strlen(slub_debug_slabs))))) flags |= slub_debug; return flags; |