aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 3904002bdb35..79940e98e5e6 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1496,7 +1496,7 @@ static unsigned long calculate_alignment(unsigned long flags,
1496 * specified alignment though. If that is greater 1496 * specified alignment though. If that is greater
1497 * then use it. 1497 * then use it.
1498 */ 1498 */
1499 if ((flags & (SLAB_MUST_HWCACHE_ALIGN | SLAB_HWCACHE_ALIGN)) && 1499 if ((flags & SLAB_HWCACHE_ALIGN) &&
1500 size > L1_CACHE_BYTES / 2) 1500 size > L1_CACHE_BYTES / 2)
1501 return max_t(unsigned long, align, L1_CACHE_BYTES); 1501 return max_t(unsigned long, align, L1_CACHE_BYTES);
1502 1502
@@ -3142,8 +3142,7 @@ SLAB_ATTR(reclaim_account);
3142 3142
3143static ssize_t hwcache_align_show(struct kmem_cache *s, char *buf) 3143static ssize_t hwcache_align_show(struct kmem_cache *s, char *buf)
3144{ 3144{
3145 return sprintf(buf, "%d\n", !!(s->flags & 3145 return sprintf(buf, "%d\n", !!(s->flags & SLAB_HWCACHE_ALIGN));
3146 (SLAB_HWCACHE_ALIGN|SLAB_MUST_HWCACHE_ALIGN)));
3147} 3146}
3148SLAB_ATTR_RO(hwcache_align); 3147SLAB_ATTR_RO(hwcache_align);
3149 3148