diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 11:07:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 11:07:27 +0000 |
| commit | 4421cbec4387a2003646b061bf2210b268997444 (patch) | |
| tree | 06de6be1eb8c3c655d09dd210fe20cd9b7f17e6c /mm | |
| parent | 6487954b8b4c1db154649951a63ba136e7867a19 (diff) | |
| parent | 43d8b1ef8250705d07fadceefa44f91b32e08328 (diff) | |
Merge tag 'v3.10.21' into linux-linaro-lsk
This is the 3.10.21 stable release
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; |