diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:20:59 -0800 |
| commit | deef2a118aed02aa9421e399056c82045e728282 (patch) | |
| tree | ffd415cb12df4d1afba0a5f9f37bf17dc3f5e86f /mm/slab_common.c | |
| parent | aa9d9be96d33d97488e1bdf13a144931a3fce08e (diff) | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a (diff) | |
| download | op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.zip op-kernel-dev-deef2a118aed02aa9421e399056c82045e728282.tar.gz | |
Merge 3.18-rc7 into staging-work.
We want those staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 4069442..dcdab81 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -259,6 +259,10 @@ struct kmem_cache *find_mergeable(size_t size, size_t align, if (s->size - size >= sizeof(void *)) continue; + if (IS_ENABLED(CONFIG_SLAB) && align && + (align > s->align || s->align % align)) + continue; + return s; } return NULL; |
