X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fslob.c;h=a3ad6671adf179daa38dae11a3963e5323ce0c91;hb=3a8247cc2c856930f34eafce33f6a039227ee175;hp=e2c3c0ec546373857ba3c2132edde98cdf5e8bb0;hpb=655d2ce073f5927194dbc28d2bd3c062a4a3caac;p=linux-2.6

diff --git a/mm/slob.c b/mm/slob.c
index e2c3c0ec54..a3ad6671ad 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -469,8 +469,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 			return ZERO_SIZE_PTR;
 
 		m = slob_alloc(size + align, gfp, align, node);
-		if (m)
-			*m = size;
+		if (!m)
+			return NULL;
+		*m = size;
 		return (void *)m + align;
 	} else {
 		void *ret;
@@ -533,7 +534,8 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
 {
 	struct kmem_cache *c;
 
-	c = slob_alloc(sizeof(struct kmem_cache), flags, 0, -1);
+	c = slob_alloc(sizeof(struct kmem_cache),
+		flags, ARCH_KMALLOC_MINALIGN, -1);
 
 	if (c) {
 		c->name = name;