---

yaml --- r: 215939 b: refs/heads/master c: 8df275a h: refs/heads/master i: 215937: af67aed 215935: 497a1c2 v: v3
git-mirror · Oct 2, 2010 · b819eb4 · b819eb4
1 parent 7213d81
commit b819eb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1d508365ea07f9f8849c7da5b02186601570f8b
+refs/heads/master: 8df275af8db8220d7e3f1bf97b6ac7aad05f96f0
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
@@ -500,7 +500,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 	} else {
 		unsigned int order = get_order(size);
 
-		ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
+		if (likely(order))
+			gfp |= __GFP_COMP;
+		ret = slob_new_pages(gfp, order, node);
 		if (ret) {
 			struct page *page;
 			page = virt_to_page(ret);