summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/slab.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index d77b7683..67d52c9e 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -20,9 +20,11 @@ static inline void *kmalloc(size_t size, gfp_t flags)
run_shrinkers();
+ size_t alignment = min(rounddown_pow_of_two(size),
+ (size_t)PAGE_SIZE);
+ size = roundup(size, alignment);
p = size
- ? aligned_alloc(min(rounddown_pow_of_two(size),
- (size_t)PAGE_SIZE), size)
+ ? aligned_alloc(alignment, size)
: malloc(0);
if (p && (flags & __GFP_ZERO))
memset(p, 0, size);