Merge pull request #31 from yshui/master

kmalloc: use posix_memalign

1 files changed, 8 insertions, 6 deletions

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 67d52c9e..32ffa55b 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -20,12 +20,14 @@ 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(alignment, size)
-	    : malloc(0);
+	if (size) {
+		size_t alignment = min(rounddown_pow_of_two(size), (size_t)PAGE_SIZE);
+		alignment = max(sizeof(void *), alignment);
+		if (posix_memalign(&p, alignment, size))
+			p = NULL;
+	} else {
+		p = malloc(0);
+	}
 	if (p && (flags & __GFP_ZERO))
 		memset(p, 0, size);